From owner-svn-src-all@FreeBSD.ORG  Sun Jan 27 17:24:50 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E055D986;
 Sun, 27 Jan 2013 17:24:50 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BA7ACCFF;
 Sun, 27 Jan 2013 17:24:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RHOobq020484;
 Sun, 27 Jan 2013 17:24:50 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RHOokx020483;
 Sun, 27 Jan 2013 17:24:50 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201301271724.r0RHOokx020483@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 27 Jan 2013 17:24:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r245989 - stable/7/sys/dev/mpt
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jan 2013 17:24:51 -0000

Author: marius
Date: Sun Jan 27 17:24:50 2013
New Revision: 245989
URL: http://svnweb.freebsd.org/changeset/base/245989

Log:
  MFC: r241875
  
  Remove support for using Giant for locking within mpt(4). Finer grained
  locking has been working fine for ~5.5 years by now.

Modified:
  stable/7/sys/dev/mpt/mpt_raid.c

Modified: stable/7/sys/dev/mpt/mpt_raid.c
==============================================================================
--- stable/7/sys/dev/mpt/mpt_raid.c	Sun Jan 27 17:16:07 2013	(r245988)
+++ stable/7/sys/dev/mpt/mpt_raid.c	Sun Jan 27 17:24:50 2013	(r245989)
@@ -726,9 +726,7 @@ mpt_raid_thread(void *arg)
 				ccb->ccb_h.func_code = XPT_SCAN_BUS;
 				ccb->ccb_h.cbfcnp = mpt_cam_rescan_callback;
 				ccb->crcn.flags = CAM_FLAG_NONE;
-				MPTLOCK_2_CAMLOCK(mpt);
 				xpt_action(ccb);
-				CAMLOCK_2_MPTLOCK(mpt);
 			}
 		}
 	}