[PATCH] Reduce the number of getattr/lookup calls in nfs_lookup_revalidate()

• Next message: Trond Myklebust: "[PATCH] add proper NFSv3 permissions checking."
• Previous message: Trond Myklebust: "[PATCH] increase socket buffer for RPC over UDP"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Reduce the number of getattr/lookup calls in nfs_lookup_revalidate()
by making the latter rely on the ordinary attribute cache, and moving
the close-to-open data consistency checking into nfs_open().

This does mean that we can end up calling GETATTR twice: once in
nfs_lookup_revalidate() then immediately after in nfs_open(), however
it also means that sys_stat() and friends now use cached attributes.

Cheers,
  Trond

diff -u --recursive --new-file linux-2.5.28-rpc_buf/fs/nfs/dir.c linux-2.5.28-cto2/fs/nfs/dir.c
--- linux-2.5.28-rpc_buf/fs/nfs/dir.c Mon Jul 22 23:33:48 2002
+++ linux-2.5.28-cto2/fs/nfs/dir.c Fri Jul 26 21:15:30 2002
@@ -430,16 +430,9 @@
 }
 
 static inline
-int nfs_lookup_verify_inode(struct inode *inode, int flags)
+int nfs_lookup_verify_inode(struct inode *inode)
 {
- struct nfs_server *server = NFS_SERVER(inode);
- /*
- * If we're interested in close-to-open cache consistency,
- * then we revalidate the inode upon lookup.
- */
- if (!(server->flags & NFS_MOUNT_NOCTO) && !(flags & LOOKUP_CONTINUE))
- NFS_CACHEINV(inode);
- return nfs_revalidate_inode(server, inode);
+ return nfs_revalidate_inode(NFS_SERVER(inode), inode);
 }
 
 /*
@@ -497,7 +490,7 @@
 
         /* Force a full look up iff the parent directory has changed */
         if (nfs_check_verifier(dir, dentry)) {
- if (nfs_lookup_verify_inode(inode, flags))
+ if (nfs_lookup_verify_inode(inode))
                         goto out_bad;
                 goto out_valid;
         }
diff -u --recursive --new-file linux-2.5.28-rpc_buf/fs/nfs/inode.c linux-2.5.28-cto2/fs/nfs/inode.c
--- linux-2.5.28-rpc_buf/fs/nfs/inode.c Fri Jul 26 00:05:29 2002
+++ linux-2.5.28-cto2/fs/nfs/inode.c Fri Jul 26 21:04:48 2002
@@ -855,15 +855,23 @@
 {
         struct rpc_auth *auth;
         struct rpc_cred *cred;
+ int err = 0;
 
         lock_kernel();
+ /* Ensure that we revalidate the data cache */
+ if (NFS_SERVER(inode)->flags & NFS_MOUNT_NOCTO) {
+ err = __nfs_revalidate_inode(NFS_SERVER(inode),inode);
+ if (err)
+ goto out;
+ }
         auth = NFS_CLIENT(inode)->cl_auth;
         cred = rpcauth_lookupcred(auth, 0);
         filp->private_data = cred;
         if (filp->f_mode & FMODE_WRITE)
                 nfs_set_mmcred(inode, cred);
+out:
         unlock_kernel();
- return 0;
+ return err;
 }
 
 int nfs_release(struct inode *inode, struct file *filp)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

• Next message: Trond Myklebust: "[PATCH] add proper NFSv3 permissions checking."
• Previous message: Trond Myklebust: "[PATCH] increase socket buffer for RPC over UDP"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Tue Jul 30 2002 - 14:00:25 EST