NFSv4: Clean up nfs4_select_rw_stateid()

Ensure that we select delegation stateids first, then
lock stateids and then open stateids.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 3578ad36a5b8..3bf5593741ee 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1929,10 +1929,12 @@ static int _nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred,
 
         nfs_fattr_init(fattr);
 
-        if (nfs4_copy_delegation_stateid(&arg.stateid, inode, FMODE_WRITE)) {
+        if (state != NULL) {
+                nfs4_select_rw_stateid(&arg.stateid, state, FMODE_WRITE,
+                                current->files, current->tgid);
+        } else if (nfs4_copy_delegation_stateid(&arg.stateid, inode,
+                                FMODE_WRITE)) {
                 /* Use that stateid */
-        } else if (state != NULL) {
-                nfs4_select_rw_stateid(&arg.stateid, state, current->files, current->tgid);
         } else
                 nfs4_stateid_copy(&arg.stateid, &zero_stateid);