aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.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/inode.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/inode.c')
-rw-r--r--fs/nfs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index df109287f2e0..be28f0251dee 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -448,7 +448,7 @@ static void nfs_inode_init_dir(struct nfs_inode *nfsi)
* instead of inode number.
*/
struct inode *
-nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, struct nfs4_label *label)
+nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
{
struct nfs_find_desc desc = {
.fh = fh,
@@ -581,7 +581,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st
fattr->size != 0)
nfs_set_cache_invalid(inode, NFS_INO_INVALID_BLOCKS);
- nfs_setsecurity(inode, fattr, label);
+ nfs_setsecurity(inode, fattr, fattr->label);
nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
nfsi->attrtimeo_timestamp = now;