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>

diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index 1b24ad07d4f535b5dd5d0cc90d75325e25cb536d..724a9b756ab09809159ff991231557c6dcd45d01 100644 (file)
--- 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;
        }