Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8fb559f87fee7f71dbf9a595095ad7d8e84c55e7
Commit: 8fb559f87fee7f71dbf9a595095ad7d8e84c55e7
Parent: 77a55a1fe8f26f7d022986a599b68002e21d968a
Author: Chuck Lever <[EMAIL PROTECTED]>
AuthorDate: Mon Sep 24 15:40:16 2007 -0400
Committer: Trond Myklebust <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 17:18:26 2007 -0400
NFS: Eliminate nfs_refresh_verifier()
nfs_set_verifier() and nfs_refresh_verifier() do exactly the same thing, so
replace one with the other.
Signed-off-by: Chuck Lever <[EMAIL PROTECTED]>
Signed-off-by: Trond Myklebust <[EMAIL PROTECTED]>
---
fs/nfs/dir.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 78144da..dde5459 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -666,11 +666,6 @@ static inline void nfs_set_verifier(struct dentry *
dentry, unsigned long verf)
dentry->d_time = verf;
}
-static void nfs_refresh_verifier(struct dentry * dentry, unsigned long verf)
-{
- nfs_set_verifier(dentry, verf);
-}
-
/*
* Return the intent data that applies to this particular path component
*
@@ -794,7 +789,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry,
struct nameidata *nd)
if ((error = nfs_refresh_inode(inode, &fattr)) != 0)
goto out_bad;
- nfs_refresh_verifier(dentry, verifier);
+ nfs_set_verifier(dentry, verifier);
out_valid:
unlock_kernel();
dput(parent);
@@ -1093,7 +1088,7 @@ static int nfs_open_revalidate(struct dentry *dentry,
struct nameidata *nd)
verifier = nfs_save_change_attribute(dir);
ret = nfs4_open_revalidate(dir, dentry, openflags, nd);
if (!ret)
- nfs_refresh_verifier(dentry, verifier);
+ nfs_set_verifier(dentry, verifier);
unlock_kernel();
out:
dput(parent);
@@ -1169,10 +1164,8 @@ static struct dentry
*nfs_readdir_lookup(nfs_readdir_descriptor_t *desc)
dentry = alias;
}
- nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
- return dentry;
out_renew:
- nfs_refresh_verifier(dentry, nfs_save_change_attribute(dir));
+ nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
return dentry;
}
@@ -1695,7 +1688,8 @@ out:
d_rehash(rehash);
if (!error) {
d_move(old_dentry, new_dentry);
- nfs_refresh_verifier(new_dentry,
nfs_save_change_attribute(new_dir));
+ nfs_set_verifier(new_dentry,
+ nfs_save_change_attribute(new_dir));
}
/* new dentry created? */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
