From owner-svn-src-head@FreeBSD.ORG  Wed Mar 18 13:54:36 2009
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 3D99F1065674;
	Wed, 18 Mar 2009 13:54:36 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C2AC8FC0C;
	Wed, 18 Mar 2009 13:54:36 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2IDsaDH027974;
	Wed, 18 Mar 2009 13:54:36 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2IDsakd027973;
	Wed, 18 Mar 2009 13:54:36 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200903181354.n2IDsakd027973@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 18 Mar 2009 13:54:36 +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: r189961 - head/sys/fs/nullfs
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: Wed, 18 Mar 2009 13:54:37 -0000

Author: pho
Date: Wed Mar 18 13:54:35 2009
New Revision: 189961
URL: http://svn.freebsd.org/changeset/base/189961

Log:
  Do not use null_bypass for VOP_ISLOCKED, directly call default
  implementation. null_bypass cannot work for the !nullfs-vnodes, in
  particular, for VBAD vnodes.
  
  In collaboration with:	kib

Modified:
  head/sys/fs/nullfs/null_vnops.c

Modified: head/sys/fs/nullfs/null_vnops.c
==============================================================================
--- head/sys/fs/nullfs/null_vnops.c	Wed Mar 18 13:47:44 2009	(r189960)
+++ head/sys/fs/nullfs/null_vnops.c	Wed Mar 18 13:54:35 2009	(r189961)
@@ -724,6 +724,7 @@ struct vop_vector null_vnodeops = {
 	.vop_getattr =		null_getattr,
 	.vop_getwritemount =	null_getwritemount,
 	.vop_inactive =		null_inactive,
+	.vop_islocked =		vop_stdislocked,
 	.vop_lock1 =		null_lock,
 	.vop_lookup =		null_lookup,
 	.vop_open =		null_open,