From owner-svn-src-head@FreeBSD.ORG  Tue Jul 13 23:07:32 2010
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 B7FCF1065672;
	Tue, 13 Jul 2010 23:07:32 +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 A794B8FC19;
	Tue, 13 Jul 2010 23:07:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6DN7W6O082788;
	Tue, 13 Jul 2010 23:07:32 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6DN7W8v082786;
	Tue, 13 Jul 2010 23:07:32 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201007132307.o6DN7W8v082786@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Tue, 13 Jul 2010 23:07:32 +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: r210032 - 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: Tue, 13 Jul 2010 23:07:32 -0000

Author: rmacklem
Date: Tue Jul 13 23:07:32 2010
New Revision: 210032
URL: http://svn.freebsd.org/changeset/base/210032

Log:
  For the experimental NFSv4 client, do not use cached attributes
  that were invalidated, even when a delegation for the file is held.
  
  MFC after:	2 weeks

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

Modified: head/sys/fs/nfsclient/nfs_clsubs.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clsubs.c	Tue Jul 13 22:55:12 2010	(r210031)
+++ head/sys/fs/nfsclient/nfs_clsubs.c	Tue Jul 13 23:07:32 2010	(r210032)
@@ -230,7 +230,7 @@ ncl_getattrcache(struct vnode *vp, struc
 #endif
 
 	if ((time_second - np->n_attrstamp) >= timeo &&
-	    mustflush != 0) {
+	    (mustflush != 0 || np->n_attrstamp == 0)) {
 		newnfsstats.attrcache_misses++;
 		mtx_unlock(&np->n_mtx);
 #ifdef NFS_ACDEBUG