summaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2021-10-22 13:11:09 -0400
committerTrond Myklebust <trond.myklebust@hammerspace.com>2021-11-05 14:54:39 -0400
commitd91bfc46426d3d772fc0d9d165e3435fd0f0a79e (patch)
tree1f8a090e1946316d24d75845d35a168765e4d270 /fs/nfs/dir.c
parent1b00ad657997c8984a9e627a3bd37ea14f20beb2 (diff)
downloadlinux-d91bfc46426d3d772fc0d9d165e3435fd0f0a79e.tar.gz
linux-d91bfc46426d3d772fc0d9d165e3435fd0f0a79e.tar.bz2
linux-d91bfc46426d3d772fc0d9d165e3435fd0f0a79e.zip
NFS: Remove the nfs4_label argument from nfs_instantiate()
Pull the label from the fattr instead. 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.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index aa95a898ad0f..48ea69af9446 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2075,12 +2075,11 @@ EXPORT_SYMBOL_GPL(nfs_add_or_obtain);
* Code common to create, mkdir, and mknod.
*/
int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,
- struct nfs_fattr *fattr,
- struct nfs4_label *label)
+ struct nfs_fattr *fattr)
{
struct dentry *d;
- d = nfs_add_or_obtain(dentry, fhandle, fattr, label);
+ d = nfs_add_or_obtain(dentry, fhandle, fattr, fattr->label);
if (IS_ERR(d))
return PTR_ERR(d);