From owner-svn-src-head@FreeBSD.ORG  Sun May 22 20:39:08 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54D51106564A;
	Sun, 22 May 2011 20:39:08 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 45AD78FC08;
	Sun, 22 May 2011 20:39:08 +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 p4MKd8ff089649;
	Sun, 22 May 2011 20:39:08 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4MKd8dQ089647;
	Sun, 22 May 2011 20:39:08 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201105222039.p4MKd8dQ089647@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 22 May 2011 20:39:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222196 - head/sys/ufs/ufs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 May 2011 20:39:08 -0000

Author: rmacklem
Date: Sun May 22 20:39:07 2011
New Revision: 222196
URL: http://svn.freebsd.org/changeset/base/222196

Log:
  Fix the ufs/ffs file system so that it uses the lock
  flags argument added to VFS_FHTOVP() by r222167.
  
  Reviewed by:	mckusick

Modified:
  head/sys/ufs/ufs/ufs_vfsops.c

Modified: head/sys/ufs/ufs/ufs_vfsops.c
==============================================================================
--- head/sys/ufs/ufs/ufs_vfsops.c	Sun May 22 20:29:47 2011	(r222195)
+++ head/sys/ufs/ufs/ufs_vfsops.c	Sun May 22 20:39:07 2011	(r222196)
@@ -218,7 +218,7 @@ ufs_fhtovp(mp, ufhp, flags, vpp)
 	struct vnode *nvp;
 	int error;
 
-	error = VFS_VGET(mp, ufhp->ufid_ino, LK_EXCLUSIVE, &nvp);
+	error = VFS_VGET(mp, ufhp->ufid_ino, flags, &nvp);
 	if (error) {
 		*vpp = NULLVP;
 		return (error);