Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / nfsd / nfs3acl.c

diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
index 35b2ebda14dacc64829635002fcb49bec2c82041..9446c67436649cebfbdca11ea82820b3586c0c13 100644 (file)
--- a/fs/nfsd/nfs3acl.c
+++ b/fs/nfsd/nfs3acl.c
@@ -101,7 +101,7 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp)
        if (error)
                goto out_errno;
 
-       fh_lock(fh);
+       inode_lock(inode);
 
        error = set_posix_acl(&init_user_ns, inode, ACL_TYPE_ACCESS,
                              argp->acl_access);
@@ -111,7 +111,7 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp)
                              argp->acl_default);
 
 out_drop_lock:
-       fh_unlock(fh);
+       inode_unlock(inode);
        fh_drop_write(fh);
 out_errno:
        resp->status = nfserrno(error);