Return-Path: Received: from mail-io0-f180.google.com ([209.85.223.180]:36396 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751491AbbL1SGA (ORCPT ); Mon, 28 Dec 2015 13:06:00 -0500 Received: by mail-io0-f180.google.com with SMTP id o67so310097824iof.3 for ; Mon, 28 Dec 2015 10:06:00 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 6/6] NFSv4.1/pNFS: Don't return NFS4ERR_DELAY unnecessarily in CB_LAYOUTRECALL Date: Mon, 28 Dec 2015 13:05:18 -0500 Message-Id: <1451325918-33544-6-git-send-email-trond.myklebust@primarydata.com> In-Reply-To: <1451325918-33544-5-git-send-email-trond.myklebust@primarydata.com> References: <1451325918-33544-1-git-send-email-trond.myklebust@primarydata.com> <1451325918-33544-2-git-send-email-trond.myklebust@primarydata.com> <1451325918-33544-3-git-send-email-trond.myklebust@primarydata.com> <1451325918-33544-4-git-send-email-trond.myklebust@primarydata.com> <1451325918-33544-5-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: 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 --- fs/nfs/callback_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 1b24ad07d4f5..724a9b756ab0 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; } -- 2.5.0