NFSv4.1: Simplify the pNFS return-on-close code

Confine it to the nfs4_do_close() code.

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

1 files changed, 2 insertions, 5 deletions

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index fc6cfe68ad1d..a5331ec094a6 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -729,11 +729,8 @@ static void __nfs4_close(struct nfs4_state *state,
         if (!call_close) {
                 nfs4_put_open_state(state);
                 nfs4_put_state_owner(owner);
-        } else {
-                bool roc = pnfs_roc(state->inode);
-
-                nfs4_do_close(state, gfp_mask, wait, roc);
-        }
+        } else
+                nfs4_do_close(state, gfp_mask, wait);
 }
 
 void nfs4_close_state(struct nfs4_state *state, fmode_t fmode)