From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF473C433E6 for ; Tue, 2 Feb 2021 16:14:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C4D264DBA for ; Tue, 2 Feb 2021 16:14:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236111AbhBBQOT (ORCPT ); Tue, 2 Feb 2021 11:14:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:38140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235148AbhBBPJm (ORCPT ); Tue, 2 Feb 2021 10:09:42 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4462F64F54; Tue, 2 Feb 2021 15:06:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612278386; bh=F/psQyLY+nbOsPUKh+KYGIt8h2uncLnKEicsxK83SlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vPB+rNHuFUo5rEImpTJbRd/U7N/EA7Angm38exKTTo/6RbTeGfC2xHlTVlDet5wWP bjUtPoXviAxZ7hHvTcqyKVoSqOUAg4cBt+i7ZwkY9NNp+eL1DqO61RSzuHW6Fkaerf FyjfQfo3j9YFlcex92v4h4ArKSSpoTGC2ztNNGP/6+0SpmB2K3pyursl70W93sPMwn tRGVIFT0ag7tGZDS7saxeFqgayZ7luOb/ALKtVaYE9jWd+rys6eR4/aTis2ycpiTDh 407evaIDvnopC4zBCRFjx1cqisPFMjcY7WNHWrEMXQNrM/FHgUKDRVQXJLvOrBQ+iY TAvkOPuInwioA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 08/25] pNFS/NFSv4: Try to return invalid layout in pnfs_layout_process() Date: Tue, 2 Feb 2021 10:05:58 -0500 Message-Id: <20210202150615.1864175-8-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210202150615.1864175-1-sashal@kernel.org> References: <20210202150615.1864175-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust [ Upstream commit 08bd8dbe88825760e953759d7ec212903a026c75 ] If the server returns a new stateid that does not match the one in our cache, then try to return the one we hold instead of just invalidating it on the client side. This ensures that both client and server will agree that the stateid is invalid. Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/pnfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 471bfa273dade..cbe7a82d55824 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -2399,7 +2399,13 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) * We got an entirely new state ID. Mark all segments for the * inode invalid, and retry the layoutget */ - pnfs_mark_layout_stateid_invalid(lo, &free_me); + struct pnfs_layout_range range = { + .iomode = IOMODE_ANY, + .length = NFS4_MAX_UINT64, + }; + pnfs_set_plh_return_info(lo, IOMODE_ANY, 0); + pnfs_mark_matching_lsegs_return(lo, &lo->plh_return_segs, + &range, 0); goto out_forget; } -- 2.27.0