From patchwork Mon Nov 11 00:52:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13870104 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D381D12D5E for ; Mon, 11 Nov 2024 00:53:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21A9B6B0093; Sun, 10 Nov 2024 19:53:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CB236B0095; Sun, 10 Nov 2024 19:53:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 094536B0096; Sun, 10 Nov 2024 19:53:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D50FE6B0093 for ; Sun, 10 Nov 2024 19:53:17 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 93C3F141570 for ; Mon, 11 Nov 2024 00:53:17 +0000 (UTC) X-FDA: 82771988922.06.047FB2D Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id 4364A40011 for ; Mon, 11 Nov 2024 00:52:25 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=k543p4gD; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of cel@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cel@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731286334; a=rsa-sha256; cv=none; b=pdCVbI3OZeStbjaZylqnySkJavhLcs2Xcj+cHf/2RRU4mOROMoWF66j2IR5SS4gWz8CB7i G5BAGgb3H2C9gK/J08B70NCuO9J5418yInnMjbzYWLKEuRjlBygqVyRFMDCoh5Ug5hAXhI 4RbxRnLhNxKNOuIj6gyf8QOE1oBWOys= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=k543p4gD; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of cel@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cel@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731286334; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=XWmvozTdER7+V3ReRar0B4FYLyqi7haHvU5MN0JybOA=; b=BsfiHMwiFVtez0t1395REjlIKnDF5BxjaywXfO/cOJdDXTYMiAsb1tuiecw9hwRViRUloI m8TUkZCTk73jmSFJqSpg5kCAyPguJp7i8wmlFTFWjedRZK/OqhTxURTRj7rpwmRL/azdr4 lxzFvameeRgU6XXMq62zkPACRUdvJc8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id AE6085C559E; Mon, 11 Nov 2024 00:52:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40C69C4CECF; Mon, 11 Nov 2024 00:53:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731286395; bh=cheGtrVFrxMD7UddlqYcWxRXeXiTalHU/TXmpLwYnLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k543p4gDIbH3NkLzJj34S7bHS+uDbygpE9kcK4a1Xs0xXeZFpl2+fmEcRbCDJjgPI pyeK/2NKMa0aXKDhYbuVz3JAdY2c8fikvdu2u41e+3O4y8p/P9PWNiEJySxlBUQtLR z46MtAPrxrvHJ0j79ygGb1jmpzBjXRcKUJ5ij0VAIdyoUEKI4ix6HsSnY8b08x3ddY 3FZ3A6Pl4ZlKJYwSLsQZdeeu7HJikjHV0uhXQYpoWLJGq2xJBzPQUbp+dqiqt7owQ4 kTp65YdpznYFFeUoSAIAWP/dH5jBTMuTH6VGjxyKEhBKkA0emLcsBvajMX5qYhWJJr bzSDRjvAtsXQg== From: cel@kernel.org To: Cc: yukuai1@huaweicloud.com, harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, viro@zeniv.linux.org.uk, brauner@kernel.org, Liam.Howlett@oracle.com, akpm@linux-foundation.org, hughd@google.com, willy@infradead.org, gregkh@linuxfoundation.org, sashal@kernel.org, srinivasan.shanmugam@amd.com, chiahsuan.chung@amd.com, mingo@kernel.org, mgorman@techsingularity.net, yukuai3@huawei.com, chengming.zhou@linux.dev, zhangpeng.00@bytedance.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, , linux-fsdevel@vger.kernel.org, maple-tree@lists.infradead.org, linux-mm@kvack.org, yi.zhang@huawei.com, yangerkun@huawei.com, Chuck Lever Subject: [RFC PATCH 4/6 6.6] libfs: Add simple_offset_rename() API Date: Sun, 10 Nov 2024 19:52:40 -0500 Message-ID: <20241111005242.34654-5-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241111005242.34654-1-cel@kernel.org> References: <20241111005242.34654-1-cel@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 4364A40011 X-Rspamd-Server: rspam11 X-Stat-Signature: ds3cpfmga6bfjendwqr9u9m8k784cyuu X-HE-Tag: 1731286345-729877 X-HE-Meta: U2FsdGVkX19znGbGyfhkXOoslM4dqDmjFX+LWpRAt6fDpftwonPS+YYQaM3dr7gex/oj8W6pxSxTANO9cpdpLCVc8v4Mfpw/FsyEF5pFuPANYq9GpVGf5ZpkXqsCuscdKxWT70sZxQPa6nRWBXNmO/wnGkooUCFWqtjPuklAMglNDT0zlVc+Nz6xqykfKqh1AlMCoSDukJq3+vqGA4IAgMQLtrt4TDkszW/dcRFY0Nl5ExCqaWIzge50bTXLD1+D2U7BX0Lob2J47yvFIq6OIEyP+ioAh1ykQeLYu9eVbjrDa7DFWldtCE2XZwj1pOtMo/UuEm7l1SQatBYFoDYSz/nuDLz48bwC1D0SWqWkwxIsnsOTePMcKulbYpO2EugLHNf9Jog1q90uDO35QIKCWMC410K6rt7Tc5liwc7YFmeiKUyl2TfHBrOTqRsTJt/YH2MiuYtZePgKQfTDS/XsPomrlBxzmOjz06+3+CH52rXQO40GZZ5D00hA1AOkDJSbb2PJdoQdhdCnRgMN1VLEpOqKgkynx4sOB/1Fv7yH3ji4GIW6zxMsTtYJ9rsXKT2pMDZ8ZOWknsvH0Ygr2FNsuPf5M9xcmJ2dRY824+7GNIWBBiNxPujW3Z5Gv02ZKVl0q86WyQx/fCG2+eXiSgOwK70bozTdU8SSnl723Zh24rbQyFnqqfXuNt81ZdDVzXjDn6StGPAfPK59HYxbMdEaH7frY6Z5wwIHGWkeYZsNEJuuVB1KXawq9+f0z1OP9D9VfOpvDKlkjtO974xna53yHuHxe0o2jCMpKLQ4l/hR0cNBRCoTES119nQV+HC3k7oMcwjgWk6rh/waHNKYzQv0iBh4BVzJNLkLKSAngu3nLAYsGviyKffhqp/F6ohobnP9QNgqehzY162LYzDJ01+PP6spyCYaEO9ixKCrS5Tb0H9Cw2O7GJ09lSMG7Cozbt1O6zV3FMbr9c3OzGM+Xhz q8FV0tDr 13g8MYvzqongCX/uyLu1GTDEcgzbW/QxiMmu9ZM+BI92kIkxd1xllBIyOs44InnsWfZNcPospWh0meodYuvYMNvdUy/y4XifiFwh0bjzkrrxBrCi3PLrZhnbIjRF6dqms1e4JwLzMpXX2JoaOZJyY1Sp3y3Dc6x+vttHRdZp2twpf3ai3fzJBHd48FYDj3yAXJah79uxRZGEppGMRzvI4g2fmUHog4om1o4NWt7t5ZMsivL9ShIv2ULtDzagpQyhgUpulwdaVMX6/Qx6uNLRx/piBkbzqbIRnvlfKHtTyS02FiGt2mUySifFUqw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Chuck Lever [ Upstream commit 5a1a25be995e1014abd01600479915683e356f5c ] I'm about to fix a tmpfs rename bug that requires the use of internal simple_offset helpers that are not available in mm/shmem.c Signed-off-by: Chuck Lever Link: https://lore.kernel.org/r/20240415152057.4605-3-cel@kernel.org Signed-off-by: Christian Brauner Stable-dep-of: ad191eb6d694 ("shmem: Fix shmem_rename2()") Signed-off-by: Chuck Lever --- fs/libfs.c | 21 +++++++++++++++++++++ include/linux/fs.h | 2 ++ mm/shmem.c | 3 +-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index 9fec0113a83f..b2dcb15d993a 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -356,6 +356,27 @@ int simple_offset_empty(struct dentry *dentry) return ret; } +/** + * simple_offset_rename - handle directory offsets for rename + * @old_dir: parent directory of source entry + * @old_dentry: dentry of source entry + * @new_dir: parent_directory of destination entry + * @new_dentry: dentry of destination + * + * Caller provides appropriate serialization. + * + * Returns zero on success, a negative errno value on failure. + */ +int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry) +{ + struct offset_ctx *old_ctx = old_dir->i_op->get_offset_ctx(old_dir); + struct offset_ctx *new_ctx = new_dir->i_op->get_offset_ctx(new_dir); + + simple_offset_remove(old_ctx, old_dentry); + return simple_offset_add(new_ctx, old_dentry); +} + /** * simple_offset_rename_exchange - exchange rename with directory offsets * @old_dir: parent of dentry being moved diff --git a/include/linux/fs.h b/include/linux/fs.h index 5104405ce3e6..e4d139fcaad0 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3198,6 +3198,8 @@ void simple_offset_init(struct offset_ctx *octx); int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry); void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry); int simple_offset_empty(struct dentry *dentry); +int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry); int simple_offset_rename_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, diff --git a/mm/shmem.c b/mm/shmem.c index e0d014eaaf73..8e8998152a0f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3439,8 +3439,7 @@ static int shmem_rename2(struct mnt_idmap *idmap, return error; } - simple_offset_remove(shmem_get_offset_ctx(old_dir), old_dentry); - error = simple_offset_add(shmem_get_offset_ctx(new_dir), old_dentry); + error = simple_offset_rename(old_dir, old_dentry, new_dir, new_dentry); if (error) return error;