nfs41: call free slot from nfs4_restart_rpc

Browse source

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>

...

This commit is contained in:

Andy Adamson 2009-12-04 15:55:29 -05:00 • committed by Trond Myklebust

parent 1d9ddde94a

commit e608e79f1b

5 changed files with 32 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

fs/nfs/internal.h

View file

29

fs/nfs/nfs4proc.c

View file

3

fs/nfs/read.c

View file

4

fs/nfs/unlink.c

View file

3

fs/nfs/write.c

View file