NFSv4: don't reprocess cached open CLAIM_PREVIOUS

commit d2bfda2e7aa036f90ccea610a657064b1e267913 upstream.

Cached opens have already been handled by _nfs4_opendata_reclaim_to_nfs4_state
and can safely skip being reprocessed, but must still call update_open_stateid
to make sure that all active fmodes are recovered.

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2e230830ff2b..d097233cd33b 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1159,10 +1159,13 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
         struct nfs4_state *state = data->state;
         int ret;
 
-        /* allow cached opens (!rpc_done && !rpc_status) */
-        if (!data->rpc_done && data->rpc_status) {
-                ret = data->rpc_status;
-                goto err;
+        if (!data->rpc_done) {
+                if (data->rpc_status) {
+                        ret = data->rpc_status;
+                        goto err;
+                }
+                /* cached opens have already been processed */
+                goto update;
         }
 
         ret = -ENOMEM;
@@ -1176,6 +1179,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
 
         if (data->o_res.delegation_type != 0)
                 nfs4_opendata_check_deleg(data, state);
+update:
         update_open_stateid(state, &data->o_res.stateid, NULL,
                             data->o_arg.fmode);