From patchwork Tue Aug 14 10:47:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10565331 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 470C91057 for ; Tue, 14 Aug 2018 10:48:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3BC72984A for ; Tue, 14 Aug 2018 10:48:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C78E0298D7; Tue, 14 Aug 2018 10:48:25 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 671F02984A for ; Tue, 14 Aug 2018 10:48:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729567AbeHNNfB (ORCPT ); Tue, 14 Aug 2018 09:35:01 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:52211 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728873AbeHNNfB (ORCPT ); Tue, 14 Aug 2018 09:35:01 -0400 Received: by mail-it0-f66.google.com with SMTP id e14-v6so17523152itf.1 for ; Tue, 14 Aug 2018 03:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9QmZhi8zEMpgZZPstcADGE9m6L78CQnMksghunkRlyo=; b=U3awue60q73jadLuJSWk6QWSL8SqI0chFv8oOu0/fOt4KLaPHOvTvnl1bhc45al8p5 9e+2MGW3iLbC/6z+M1/8ClbdW5HD7w1i5p8iB6KrKs/bWgRCP0xSzKVEsbTt7KwrB0as 0wExMGqd1b/rOIutIBO/hqVzpOPwd0v/nndK1DxugZgl510I802v0Di85CKGgm4mpvP9 0TJ2L52/jX3fWI/jsEYBkehcuXxH6JqiOOCXROgd6HwVqYSeEJnfTHWmptdPqiMu0v+N tErKHyy1nEQYUivSCeS/2DITYzT3C/eOyrZXsJkA1W2npidzq9fwSp0AfdJyorBEUGtc T7ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9QmZhi8zEMpgZZPstcADGE9m6L78CQnMksghunkRlyo=; b=EwTXmvimlYCbX25lakgLagyB5tSXEZgroiCvf5FocqigqPbRfi5Wcw6z7m8minQIFk 6y1wwqAc7mm2eTBshCmCu7AzrCkoXRcdECRvQrix3Uu8jeu4utQTySaf1jtV42GEOtjr ZIcWiS3OBWAXbFQ0SJhkR/uDy2LviiMkmZRbHI6dRcczuWcILORa95EXNtLCHYHqRZnN 6ojFWlps0akp94CWsGCz+9mN+Uo4hKc+6AMQb41H0mBkDJe0vo0cD9wX9yNh1pKY7z9S UXS9/mPzocObrsBZhxDBlx3EHKuIYYnK4oiDQedFpLTUHbbu532WF9t4AhdMhAIJT7td uM1g== X-Gm-Message-State: AOUpUlGYksDs/XWsCH4mEocBOuweR2tfCSN5zpJL5mE3Lt+N1HVLZLBo A3lOUTjzGwx7Lw1nnjCcEQ== X-Google-Smtp-Source: AA+uWPymnNJ/ank9Dq9BNIoOZlQt/k5RvtpkHta1gog1uByXsF5YHAdtb3Odn7YYjWkedEMfOhVYPw== X-Received: by 2002:a24:98d6:: with SMTP id n205-v6mr14192604itd.44.1534243702951; Tue, 14 Aug 2018 03:48:22 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-124-244-228.alma.mi.frontiernet.net. [50.124.244.228]) by smtp.gmail.com with ESMTPSA id e7-v6sm4025453iog.56.2018.08.14.03.48.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Aug 2018 03:48:22 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH] pNFS: When updating the stateid in layoutreturn, also update the recall range Date: Tue, 14 Aug 2018 06:47:59 -0400 Message-Id: <20180814104759.20556-1-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 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 When we update the layout stateid in nfs4_layoutreturn_refresh_stateid, we should also update the range in order to let the server know we're actually returning everything. Fixes: 16c278dbfa63 ("pnfs: Fix handling of NFS4ERR_OLD_STATEID replies...") Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 3 +++ fs/nfs/pnfs.c | 5 ++++- fs/nfs/pnfs.h | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 9a349587d077..a5f0de68e710 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3246,6 +3246,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) break; case -NFS4ERR_OLD_STATEID: if (nfs4_layoutreturn_refresh_stateid(&calldata->arg.lr_args->stateid, + &calldata->arg.lr_args->range, calldata->inode)) goto lr_restart; /* Fallthrough */ @@ -5950,6 +5951,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) break; case -NFS4ERR_OLD_STATEID: if (nfs4_layoutreturn_refresh_stateid(&data->args.lr_args->stateid, + &data->args.lr_args->range, data->inode)) goto lr_restart; /* Fallthrough */ @@ -8899,6 +8901,7 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) switch (task->tk_status) { case -NFS4ERR_OLD_STATEID: if (nfs4_layoutreturn_refresh_stateid(&lrp->args.stateid, + &lrp->args.range, lrp->args.inode)) goto out_restart; /* Fallthrough */ diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 8f03bdb191aa..8ef3c1feee92 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -361,7 +361,9 @@ pnfs_clear_lseg_state(struct pnfs_layout_segment *lseg, /* * Update the seqid of a layout stateid */ -bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct inode *inode) +bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, + struct pnfs_layout_range *dst_range, + struct inode *inode) { struct pnfs_layout_hdr *lo; struct pnfs_layout_range range = { @@ -379,6 +381,7 @@ bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct inode *inode) err = pnfs_mark_matching_lsegs_return(lo, &head, &range, 0); if (err != -EBUSY) { dst->seqid = lo->plh_stateid.seqid; + *dst_range = range; ret = true; } } diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 1a38a3b533b5..f490d19f7290 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -259,7 +259,9 @@ int pnfs_destroy_layouts_byfsid(struct nfs_client *clp, bool is_recall); int pnfs_destroy_layouts_byclid(struct nfs_client *clp, bool is_recall); -bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, struct inode *inode); +bool nfs4_layoutreturn_refresh_stateid(nfs4_stateid *dst, + struct pnfs_layout_range *dst_range, + struct inode *inode); void pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo); void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new,