From owner-svn-src-head@FreeBSD.ORG  Wed Jul 22 14:32:28 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 5E2B4106564A;
	Wed, 22 Jul 2009 14:32:28 +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 4C0288FC1A;
	Wed, 22 Jul 2009 14:32:28 +0000 (UTC)
	(envelope-from rmacklem@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 n6MEWSBM043609;
	Wed, 22 Jul 2009 14:32:28 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6MEWSWp043607;
	Wed, 22 Jul 2009 14:32:28 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <200907221432.n6MEWSWp043607@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 22 Jul 2009 14:32:28 +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: r195819 - head/sys/fs/nfsclient
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, 22 Jul 2009 14:32:28 -0000

Author: rmacklem
Date: Wed Jul 22 14:32:28 2009
New Revision: 195819
URL: http://svn.freebsd.org/changeset/base/195819

Log:
  When using an NFSv4 mount in the experimental nfs client with delegations
  being issued from the server, there was a case where an Open issued locally
  based on the delegation would be released before the associated vnode
  became inactive. If the delegation was recalled after the open was released,
  an Open against the server would not have been acquired and subsequent I/O
  operations would need to use the special stateid of all zeros. This patch
  fixes that case.
  
  Approved by:	re (kensmith), kib (mentor)

Modified:
  head/sys/fs/nfsclient/nfs_clstate.c

Modified: head/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clstate.c	Wed Jul 22 11:57:34 2009	(r195818)
+++ head/sys/fs/nfsclient/nfs_clstate.c	Wed Jul 22 14:32:28 2009	(r195819)
@@ -2472,7 +2472,7 @@ tryagain:
 			clearok = 1;
 			LIST_FOREACH(owp, &dp->nfsdl_owner, nfsow_list) {
 			    op = LIST_FIRST(&owp->nfsow_open);
-			    if (op != NULL && op->nfso_opencnt > 0) {
+			    if (op != NULL) {
 				clearok = 0;
 				break;
 			    }