Subject: [PATCH] NFS: use attribute timeout instead of "noac" mount option

 The behavior enabled by the "noac" mount option should be precisely
 equivalent to setting acreg{min,max} or acdir{min,max} to zero via mount
 options.

 Signed-off-by: Chuck Lever <cel@netapp.com>
 Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

---
 inode.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.10-rc1-NFS_ALL/fs/nfs/inode.c
===================================================================
--- linux-2.6.10-rc1-NFS_ALL.orig/fs/nfs/inode.c	2004-10-25 15:58:00.793322579 -0400
+++ linux-2.6.10-rc1-NFS_ALL/fs/nfs/inode.c	2004-10-25 15:58:05.142745194 -0400
@@ -956,7 +956,7 @@ __nfs_revalidate_inode(struct nfs_server
 		status = nfs_wait_on_inode(inode, NFS_INO_REVALIDATING);
 		if (status < 0)
 			goto out_nowait;
-		if (NFS_SERVER(inode)->flags & NFS_MOUNT_NOAC)
+		if (NFS_ATTRTIMEO(inode) == 0)
 			continue;
 		if (NFS_FLAGS(inode) & (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ATIME))
 			continue;