summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2011-04-18 15:57:32 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-04-18 17:05:48 -0400
commit468f86134ee515234afe5c5b3f39f266c50e61a5 (patch)
tree912d0d587ffa2897ce16ed1258e8f52b23308b61 /fs
parent47c2199b6eb5fbe38ddb844db7cdbd914d304f9c (diff)
downloadblackbird-op-linux-468f86134ee515234afe5c5b3f39f266c50e61a5.tar.gz
blackbird-op-linux-468f86134ee515234afe5c5b3f39f266c50e61a5.zip
NFSv4.1: Don't update sequence number if rpc_task is not sent
If we fail to contact the gss upcall program, then no message will be sent to the server. The client still updated the sequence number, however, and this lead to NFS4ERR_SEQ_MISMATCH for the next several RPC calls. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index b8e1ac69b743..e7e2077eebd9 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -444,8 +444,8 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
if (res->sr_status == 1)
res->sr_status = NFS_OK;
- /* -ERESTARTSYS can result in skipping nfs41_sequence_setup */
- if (!res->sr_slot)
+ /* don't increment the sequence number if the task wasn't sent */
+ if (!RPC_WAS_SENT(task))
goto out;
/* Check the SEQUENCE operation status */
OpenPOWER on IntegriCloud