summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-12-28 17:21:50 (GMT)
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-12-28 19:33:05 (GMT)
commite0d9243048fd18da695b8d3fe331176eac60866e (patch)
tree062c4b322a2c0d2f3ad3dc868955de259bbbb568 /fs/nfs
parent41c9127d6d588138c66b2614ac596ea63313acca (diff)
downloadlinux-e0d9243048fd18da695b8d3fe331176eac60866e.tar.xz
NFSv4.1/pNFS: Don't return NFS4ERR_DELAY unnecessarily in CB_LAYOUTRECALL
If the client is promising to return the layout ASAP, then there is no need to return DELAY and have the server retry. Instead default to the normal procedure described in RFC5661. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/callback_proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index 1b24ad0..724a9b7 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -214,7 +214,7 @@ static u32 initiate_file_draining(struct nfs_client *clp,
pnfs_mark_matching_lsegs_return(lo,
&free_me_list,
&args->cbl_range);
- rv = NFS4ERR_DELAY;
+ rv = NFS4_OK;
goto unlock;
}