From patchwork Mon Nov 6 15:27:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10043711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2A26960247 for ; Mon, 6 Nov 2017 15:27:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1351629E9B for ; Mon, 6 Nov 2017 15:27:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0876F29E9F; Mon, 6 Nov 2017 15:27:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC95A29E9B for ; Mon, 6 Nov 2017 15:27:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932189AbdKFP1s (ORCPT ); Mon, 6 Nov 2017 10:27:48 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:54730 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932155AbdKFP1r (ORCPT ); Mon, 6 Nov 2017 10:27:47 -0500 Received: by mail-it0-f65.google.com with SMTP id 72so5484809itk.3 for ; Mon, 06 Nov 2017 07:27:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C0EGdVMrE9bPv0FW+Ub7nSW/6B2nfnAgCtoyAaMzZes=; b=dNhtMVAt3DRIILShWhTHXJ0iCPn9jhW60ap6NZKDFOWOJpP85ClITYhzzRdP/qkoeb 0mTKlnTXtchj2pVpq14B13OagwrWx2m4ZZfSPBaBnNqHrrDMh7J1+EJfooiHgPt3H5ta UXIY5S4ULGy2+qtHcpAwiigLp3VbxWKmFOOTgPbseMP9mgP5R1J/FVaA9y5ejZGFyR+e Fa0NvhSbmKlNDFh3YHUQFGACrpbVk0eQWxEILvGFMp9o/HEg/SDx2vw/VD36GF/7f5E2 QfHPS5E2yWhy4FcmcQFPGo9qYrtnsNoXkTxP9EmYQOt4tzKNUcspqa9WU3ynZPiiKIEW HYKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=C0EGdVMrE9bPv0FW+Ub7nSW/6B2nfnAgCtoyAaMzZes=; b=XpVza19D09Pqcp/6UFYzYs3zXVkHoXhl+LERsNVbvPzSz83dbiYTtlUBL2dQJ5iTDc 7hLxnmvtPtjHFhhUo3CN0cb1lHFvzQ8xzSUjnT90VTb0ydHjzjLBnOJBxQ+O1jbmzLbK ACG4tRfmvAGoPmlf9aQJAFbSdaNYygCX5Wkw5A07EjkJv3j1tE7z+YY/PxudhYyYCRDU cuufKIlW0BAi2fVr0ZWo0J9DsbjpSn0L15b2AgATDRJLjfHzfWeSFCbn4oGQd4BiBwIR ZE/Rl7Y1Yw/fynuzC0tQgc3VFMSLrHsYExmwXMqtAekkPbo0aw8Ylpuyy5S4g+HTqQj0 4XJw== X-Gm-Message-State: AJaThX7EJcBdWQzOjKquPkXMD0oY995PiATxk4nb2H80fJTLCMmJ8PEG XyqWq4jFB76OWfVpogFYFw== X-Google-Smtp-Source: ABhQp+SN7wOrQxoXFBi7hqIEAJpPI6IHJ7s86IwmXvfOYYcyIIXQzUJP07/VHYSPLIUDxohLmf8c3w== X-Received: by 10.36.94.7 with SMTP id h7mr9750999itb.42.1509982067136; Mon, 06 Nov 2017 07:27:47 -0800 (PST) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id p10sm5807007ioe.19.2017.11.06.07.27.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Nov 2017 07:27:46 -0800 (PST) From: Trond Myklebust To: Benjamin Coddington , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v7 08/10] NFSv4: Retry NFS4ERR_OLD_STATEID errors in layoutreturn Date: Mon, 6 Nov 2017 10:27:24 -0500 Message-Id: <20171106152726.13755-9-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171106152726.13755-8-trond.myklebust@primarydata.com> References: <20171106152726.13755-1-trond.myklebust@primarydata.com> <20171106152726.13755-2-trond.myklebust@primarydata.com> <20171106152726.13755-3-trond.myklebust@primarydata.com> <20171106152726.13755-4-trond.myklebust@primarydata.com> <20171106152726.13755-5-trond.myklebust@primarydata.com> <20171106152726.13755-6-trond.myklebust@primarydata.com> <20171106152726.13755-7-trond.myklebust@primarydata.com> <20171106152726.13755-8-trond.myklebust@primarydata.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If our layoutreturn returns an NFS4ERR_OLD_STATEID, then try to update the stateid and retry. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1bb0e405aa57..f11230db8d25 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8766,18 +8766,27 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) server = NFS_SERVER(lrp->args.inode); switch (task->tk_status) { + case -NFS4ERR_OLD_STATEID: + if (nfs4_refresh_layout_stateid(&lrp->args.stateid, + lrp->args.inode)) + goto out_restart; + /* Fallthrough */ default: task->tk_status = 0; + /* Fallthrough */ case 0: break; case -NFS4ERR_DELAY: if (nfs4_async_handle_error(task, server, NULL, NULL) != -EAGAIN) break; - nfs4_sequence_free_slot(&lrp->res.seq_res); - rpc_restart_call_prepare(task); - return; + goto out_restart; } dprintk("<-- %s\n", __func__); + return; +out_restart: + task->tk_status = 0; + nfs4_sequence_free_slot(&lrp->res.seq_res); + rpc_restart_call_prepare(task); } static void nfs4_layoutreturn_release(void *calldata)