diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-01 15:34:05 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-05 17:03:53 -0400 |
| commit | 8b6cc4d6f841d31f72fe7478453759166d366274 (patch) | |
| tree | d1402a785614147d8abd70ea4a40cc82938dd779 /fs/nfs | |
| parent | dbb21c25a35a71baf413f5176f028ee11b88cfbc (diff) | |
| download | op-kernel-dev-8b6cc4d6f841d31f72fe7478453759166d366274.zip op-kernel-dev-8b6cc4d6f841d31f72fe7478453759166d366274.tar.gz | |
NFSv4: Handle NFS4ERR_DELAY and NFS4ERR_GRACE in nfs4_open_delegation_recall
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/nfs')
| -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 dc4037c..6630db1 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1432,6 +1432,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; } set_bit(NFS_DELEGATED_STATE, &state->flags); err = nfs4_handle_exception(server, err, &exception); |
