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 <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
77a55a1fe8
commit
8fb559f87f
16
fs/nfs/dir.c
16
fs/nfs/dir.c
|
@ -666,11 +666,6 @@ static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
|
||||||
dentry->d_time = 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
|
* 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)
|
if ((error = nfs_refresh_inode(inode, &fattr)) != 0)
|
||||||
goto out_bad;
|
goto out_bad;
|
||||||
|
|
||||||
nfs_refresh_verifier(dentry, verifier);
|
nfs_set_verifier(dentry, verifier);
|
||||||
out_valid:
|
out_valid:
|
||||||
unlock_kernel();
|
unlock_kernel();
|
||||||
dput(parent);
|
dput(parent);
|
||||||
|
@ -1093,7 +1088,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd)
|
||||||
verifier = nfs_save_change_attribute(dir);
|
verifier = nfs_save_change_attribute(dir);
|
||||||
ret = nfs4_open_revalidate(dir, dentry, openflags, nd);
|
ret = nfs4_open_revalidate(dir, dentry, openflags, nd);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
nfs_refresh_verifier(dentry, verifier);
|
nfs_set_verifier(dentry, verifier);
|
||||||
unlock_kernel();
|
unlock_kernel();
|
||||||
out:
|
out:
|
||||||
dput(parent);
|
dput(parent);
|
||||||
|
@ -1169,10 +1164,8 @@ static struct dentry *nfs_readdir_lookup(nfs_readdir_descriptor_t *desc)
|
||||||
dentry = alias;
|
dentry = alias;
|
||||||
}
|
}
|
||||||
|
|
||||||
nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
|
|
||||||
return dentry;
|
|
||||||
out_renew:
|
out_renew:
|
||||||
nfs_refresh_verifier(dentry, nfs_save_change_attribute(dir));
|
nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
|
||||||
return dentry;
|
return dentry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1695,7 +1688,8 @@ out:
|
||||||
d_rehash(rehash);
|
d_rehash(rehash);
|
||||||
if (!error) {
|
if (!error) {
|
||||||
d_move(old_dentry, new_dentry);
|
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? */
|
/* new dentry created? */
|
||||||
|
|
Loading…
Reference in a new issue