From patchwork Sun Feb 2 20:46:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 13956671 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from pdx1-mailman-customer002.dreamhost.com (listserver-buz.dreamhost.com [69.163.136.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DE56AC0218F for ; Sun, 2 Feb 2025 21:11:11 +0000 (UTC) Received: from pdx1-mailman-customer002.dreamhost.com (localhost [127.0.0.1]) by pdx1-mailman-customer002.dreamhost.com (Postfix) with ESMTP id 4YmMJb5mYvz20vy; Sun, 02 Feb 2025 12:52:31 -0800 (PST) Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by pdx1-mailman-customer002.dreamhost.com (Postfix) with ESMTPS id 4YmMFd2jq4z212b for ; Sun, 02 Feb 2025 12:49:57 -0800 (PST) Received: from star2.ccs.ornl.gov (ltm2-e204-208.ccs.ornl.gov [160.91.203.3]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 0E5DB881A9F; Sun, 2 Feb 2025 15:46:42 -0500 (EST) Received: by star2.ccs.ornl.gov (Postfix, from userid 2004) id 0C31F106BE16; Sun, 2 Feb 2025 15:46:42 -0500 (EST) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Sun, 2 Feb 2025 15:46:27 -0500 Message-ID: <20250202204633.1148872-28-jsimmons@infradead.org> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250202204633.1148872-1-jsimmons@infradead.org> References: <20250202204633.1148872-1-jsimmons@infradead.org> MIME-Version: 1.0 Subject: [lustre-devel] [PATCH 27/33] lustre: llite: update comment of ll_swap_layouts_close X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Xi , Lustre Development List Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Li Xi mdc_close_layout_swap_pack() does not exist, and the lease lock handle is release in mdc_close_intent_pack(). This patch updates the comment. WC-bug-id: https://jira.whamcloud.com/browse/LU-16748 Lustre-commit: cfef0d9d5e708d534 ("LU-16748 llite: update comment of ll_swap_layouts_close") Signed-off-by: Li Xi Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50660 Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger Reviewed-by: Timothy Day Signed-off-by: James Simmons --- fs/lustre/llite/file.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/lustre/llite/file.c b/fs/lustre/llite/file.c index e745dc8c53a5..7899ffdd92fb 100644 --- a/fs/lustre/llite/file.c +++ b/fs/lustre/llite/file.c @@ -1324,9 +1324,8 @@ static int ll_swap_layouts_close(struct obd_client_handle *och, goto out_free_och; } - /* - * Close the file and {swap,merge} layouts between inode & inode2. - * NB: lease lock handle is released in mdc_close_layout_swap_pack() + /* Close the file and {swap,merge} layouts between inode & inode2. + * NB: local lease handle is released in mdc_close_intent_pack() * because we still need it to pack l_remote_handle to MDT. */ rc = ll_close_inode_openhandle(inode, och, MDS_CLOSE_LAYOUT_SWAP,