NFS: Remove the redundant nfs_reval_fsid()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
81c768808c
commit
efbb06b7f9
1 changed files with 0 additions and 15 deletions
15
fs/nfs/dir.c
15
fs/nfs/dir.c
|
@ -864,16 +864,6 @@ int nfs_is_exclusive_create(struct inode *dir, struct nameidata *nd)
|
||||||
return (nd->intent.open.flags & O_EXCL) != 0;
|
return (nd->intent.open.flags & O_EXCL) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int nfs_reval_fsid(struct inode *dir, const struct nfs_fattr *fattr)
|
|
||||||
{
|
|
||||||
struct nfs_server *server = NFS_SERVER(dir);
|
|
||||||
|
|
||||||
if (!nfs_fsid_equal(&server->fsid, &fattr->fsid))
|
|
||||||
/* Revalidate fsid using the parent directory */
|
|
||||||
return __nfs_revalidate_inode(server, dir);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
|
static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
|
||||||
{
|
{
|
||||||
struct dentry *res;
|
struct dentry *res;
|
||||||
|
@ -912,11 +902,6 @@ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, stru
|
||||||
res = ERR_PTR(error);
|
res = ERR_PTR(error);
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
error = nfs_reval_fsid(dir, &fattr);
|
|
||||||
if (error < 0) {
|
|
||||||
res = ERR_PTR(error);
|
|
||||||
goto out_unlock;
|
|
||||||
}
|
|
||||||
inode = nfs_fhget(dentry->d_sb, &fhandle, &fattr);
|
inode = nfs_fhget(dentry->d_sb, &fhandle, &fattr);
|
||||||
res = (struct dentry *)inode;
|
res = (struct dentry *)inode;
|
||||||
if (IS_ERR(res))
|
if (IS_ERR(res))
|
||||||
|
|
Loading…
Add table
Reference in a new issue