NFSD: use (un)lock_inode instead of fh_(un)lock for file operations

[ Upstream commit bb4d53d66e4b8c8b8e5634802262e53851a2d2db ]

When locking a file to access ACLs and xattrs etc, use explicit locking
with inode_lock() instead of fh_lock().  This means that the calls to
fh_fill_pre/post_attr() are also explicit which improves readability and
allows us to place them only where they are needed.  Only the xattr
calls need pre/post information.

When locking a file we don't need I_MUTEX_PARENT as the file is not a
parent of anything, so we can use inode_lock() directly rather than the
inode_lock_nested() call that fh_lock() uses.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index efcd429b0f28ec3bfbaa397804c125ff059cc371..87f224cd30a85869ff662d1210b1a75289d802d9 100644 (file)
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -111,7 +111,7 @@ static __be32 nfsacld_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);
@@ -122,7 +122,7 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst *rqstp)
        if (error)
                goto out_drop_lock;
 
-       fh_unlock(fh);
+       inode_unlock(inode);
 
        fh_drop_write(fh);
 
@@ -136,7 +136,7 @@ out:
        return rpc_success;
 
 out_drop_lock:
-       fh_unlock(fh);
+       inode_unlock(inode);
        fh_drop_write(fh);
 out_errno:
        resp->status = nfserrno(error);

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);

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f66fb397148935c0615cd50d94110bffce26bbf4..66cf8217ebe5776dbe8a3a6d5066ad5f9709f110 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -7415,21 +7415,22 @@ out:
 static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock)
 {
        struct nfsd_file *nf;
+       struct inode *inode;
        __be32 err;
 
        err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_READ, &nf);
        if (err)
                return err;
-       fh_lock(fhp); /* to block new leases till after test_lock: */
-       err = nfserrno(nfsd_open_break_lease(fhp->fh_dentry->d_inode,
-                                                       NFSD_MAY_READ));
+       inode = fhp->fh_dentry->d_inode;
+       inode_lock(inode); /* to block new leases till after test_lock: */
+       err = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));
        if (err)
                goto out;
        lock->fl_file = nf->nf_file;
        err = nfserrno(vfs_test_lock(nf->nf_file, lock));
        lock->fl_file = NULL;
 out:
-       fh_unlock(fhp);
+       inode_unlock(inode);
        nfsd_file_put(nf);
        return err;
 }

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 7de76b37a9bc23773c21c6a915f2e4765ccc3e50..73a153be6a5adb2529275346193077bdb0635cc2 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -417,7 +417,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
                        return err;
        }
 
-       fh_lock(fhp);
+       inode_lock(inode);
        if (size_change) {
                /*
                 * RFC5661, Section 18.30.4:
@@ -465,7 +465,7 @@ out_unlock:
                attr->na_aclerr = set_posix_acl(&init_user_ns,
                                                inode, ACL_TYPE_DEFAULT,
                                                attr->na_dpacl);
-       fh_unlock(fhp);
+       inode_unlock(inode);
        if (size_change)
                put_write_access(inode);
 out:
@@ -2156,13 +2156,16 @@ out:
        return err;
 }
 
-/*
- * Removexattr and setxattr need to call fh_lock to both lock the inode
- * and set the change attribute. Since the top-level vfs_removexattr
- * and vfs_setxattr calls already do their own inode_lock calls, call
- * the _locked variant. Pass in a NULL pointer for delegated_inode,
- * and let the client deal with NFS4ERR_DELAY (same as with e.g.
- * setattr and remove).
+/**
+ * nfsd_removexattr - Remove an extended attribute
+ * @rqstp: RPC transaction being executed
+ * @fhp: NFS filehandle of object with xattr to remove
+ * @name: name of xattr to remove (NUL-terminate)
+ *
+ * Pass in a NULL pointer for delegated_inode, and let the client deal
+ * with NFS4ERR_DELAY (same as with e.g. setattr and remove).
+ *
+ * Returns nfs_ok on success, or an nfsstat in network byte order.
  */
 __be32
 nfsd_removexattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name)
@@ -2178,12 +2181,14 @@ nfsd_removexattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name)
        if (ret)
                return nfserrno(ret);
 
-       fh_lock(fhp);
+       inode_lock(fhp->fh_dentry->d_inode);
+       fh_fill_pre_attrs(fhp);
 
        ret = __vfs_removexattr_locked(&init_user_ns, fhp->fh_dentry,
                                       name, NULL);
 
-       fh_unlock(fhp);
+       fh_fill_post_attrs(fhp);
+       inode_unlock(fhp->fh_dentry->d_inode);
        fh_drop_write(fhp);
 
        return nfsd_xattr_errno(ret);
@@ -2203,12 +2208,13 @@ nfsd_setxattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name,
        ret = fh_want_write(fhp);
        if (ret)
                return nfserrno(ret);
-       fh_lock(fhp);
+       inode_lock(fhp->fh_dentry->d_inode);
+       fh_fill_pre_attrs(fhp);
 
        ret = __vfs_setxattr_locked(&init_user_ns, fhp->fh_dentry, name, buf,
                                    len, flags, NULL);
-
-       fh_unlock(fhp);
+       fh_fill_post_attrs(fhp);
+       inode_unlock(fhp->fh_dentry->d_inode);
        fh_drop_write(fhp);
 
        return nfsd_xattr_errno(ret);