diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-01 15:34:05 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-07 19:57:26 -0700 |
| commit | ebcd3f67c004ee5c51a9379d744e5546be73f227 (patch) | |
| tree | 97aaee5ea13dd5ed35ceb22a596ed6930f078e92 | |
| parent | 3b5f7654971e0dcb6c422d14cbae7309686bb344 (diff) | |
| download | kernel_samsung_smdk4412-ebcd3f67c004ee5c51a9379d744e5546be73f227.tar.gz kernel_samsung_smdk4412-ebcd3f67c004ee5c51a9379d744e5546be73f227.tar.bz2 kernel_samsung_smdk4412-ebcd3f67c004ee5c51a9379d744e5546be73f227.zip | |
NFSv4: Handle NFS4ERR_DELAY and NFS4ERR_GRACE in nfs4_open_delegation_recall
commit 8b6cc4d6f841d31f72fe7478453759166d366274 upstream.
A server shouldn't normally return NFS4ERR_GRACE if the client holds a
delegation, since no conflicting lock reclaims can be granted, however
the spec does not require the server to grant the open in this
instance
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/nfs/nfs4proc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 894e326ec2e..7204bcc0b24 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1335,6 +1335,12 @@ int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state case -ENOMEM: err = 0; goto out; + case -NFS4ERR_DELAY: + case -NFS4ERR_GRACE: + set_bit(NFS_DELEGATED_STATE, &state->flags); + ssleep(1); + err = -EAGAIN; + goto out; } err = nfs4_handle_exception(server, err, &exception); } while (exception.retry); |