From owner-svn-src-all@FreeBSD.ORG  Sun Oct  7 18:41:49 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1822A106566B;
	Sun,  7 Oct 2012 18:41:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 03A818FC08;
	Sun,  7 Oct 2012 18:41:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q97IfmiS050037;
	Sun, 7 Oct 2012 18:41:48 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97IfmJt050035;
	Sun, 7 Oct 2012 18:41:48 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201210071841.q97IfmJt050035@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Sun, 7 Oct 2012 18:41:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241324 - stable/9/sys/dev/mfi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 07 Oct 2012 18:41:49 -0000

Author: jhb
Date: Sun Oct  7 18:41:48 2012
New Revision: 241324
URL: http://svn.freebsd.org/changeset/base/241324

Log:
  MFC 240962:
  Grab the mfi_config_lock while performing a MFI_DCMD_CFG_FOREIGN_IMPORT
  request on behalf of a user utility.

Modified:
  stable/9/sys/dev/mfi/mfi.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/mfi/mfi.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi.c	Sun Oct  7 18:37:59 2012	(r241323)
+++ stable/9/sys/dev/mfi/mfi.c	Sun Oct  7 18:41:48 2012	(r241324)
@@ -2550,6 +2550,7 @@ mfi_config_lock(struct mfi_softc *sc, ui
 	case MFI_DCMD_LD_DELETE:
 	case MFI_DCMD_CFG_ADD:
 	case MFI_DCMD_CFG_CLEAR:
+	case MFI_DCMD_CFG_FOREIGN_IMPORT:
 		sx_xlock(&sc->mfi_config_lock);
 		return (1);
 	default: