nfs41: call free slot from nfs4_restart_rpc
authorAndy Adamson <andros@netapp.com>
Fri, 4 Dec 2009 20:55:29 +0000 (15:55 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 4 Dec 2009 20:55:29 +0000 (15:55 -0500)
commite608e79f1bf4b967afcf57777e63b5f0939b00e8
treed649b5714435b7d2d4edd5779fa22122d61ee0c5
parent1d9ddde94aed01c4618cf6f70883cc511c3b2b62
nfs41: call free slot from nfs4_restart_rpc

nfs41_sequence_free_slot can be called multiple times on SEQUENCE operation
errors.
No reason to inline nfs4_restart_rpc

Reported-by: Trond Myklebust <trond.myklebust@netapp.com>
nfs_writeback_done and nfs_readpage_retry call nfs4_restart_rpc outside the
error handler, and the slot is not freed prior to restarting in the rpc_prepare
state during session reset.

Fix this by moving the call to nfs41_sequence_free_slot from the error
path of nfs41_sequence_done into nfs4_restart_rpc, and by removing the test
for NFS4CLNT_SESSION_SETUP.
Always free slot and goto the rpc prepare state on async errors.

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/internal.h
fs/nfs/nfs4proc.c
fs/nfs/read.c
fs/nfs/unlink.c
fs/nfs/write.c