aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2021-10-22 13:11:11 -0400
committerTrond Myklebust <trond.myklebust@hammerspace.com>2021-11-05 14:54:40 -0400
commitcf7ab00aabbf9c8f1ec72edff15849ddc23aa6a7 (patch)
tree650bdb85dddc6d385c700b10d15fbb99176da38e /fs/nfs/dir.c
parentNFS: Remove the nfs4_label argument from nfs_add_or_obtain() (diff)
downloadlinux-dev-cf7ab00aabbf9c8f1ec72edff15849ddc23aa6a7.tar.xz
linux-dev-cf7ab00aabbf9c8f1ec72edff15849ddc23aa6a7.zip
NFS: Remove the nfs4_label argument from nfs_fhget()
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r--fs/nfs/dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 1c74f9d2f3a1..bd89f39e8ba9 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -697,7 +697,7 @@ again:
goto out;
}
- inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr, entry->fattr->label);
+ inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr);
alias = d_splice_alias(inode, dentry);
d_lookup_done(dentry);
if (alias) {
@@ -1782,7 +1782,7 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in
res = ERR_PTR(error);
goto out;
}
- inode = nfs_fhget(dentry->d_sb, fhandle, fattr, fattr->label);
+ inode = nfs_fhget(dentry->d_sb, fhandle, fattr);
res = ERR_CAST(inode);
if (IS_ERR(res))
goto out;
@@ -2059,7 +2059,7 @@ nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle,
if (error < 0)
goto out_error;
}
- inode = nfs_fhget(dentry->d_sb, fhandle, fattr, fattr->label);
+ inode = nfs_fhget(dentry->d_sb, fhandle, fattr);
d = d_splice_alias(inode, dentry);
out:
dput(parent);