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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEC4BE77170 for ; Wed, 4 Dec 2024 15:53:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1875F6B0088; Wed, 4 Dec 2024 10:53:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 110016B008A; Wed, 4 Dec 2024 10:53:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA4CE6B0089; Wed, 4 Dec 2024 10:53:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C55906B0085 for ; Wed, 4 Dec 2024 10:53:07 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5BA46810A2 for ; Wed, 4 Dec 2024 15:53:07 +0000 (UTC) X-FDA: 82857719742.19.0DDF911 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id 9931E100004 for ; Wed, 4 Dec 2024 15:52:49 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A8mUmlEm; spf=pass (imf14.hostedemail.com: domain of cel@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cel@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733327576; 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=TS0i0pF5SCGKiBSNDlxh+Mkj786d4YXV0ZMA76DJ4Rw=; b=aDRQKDk04vLkXaEHaHo7waZAIKg39bPHsxHssmZ3iYedLLMkWmJSa/n9McSWtBPtP6MYY/ Qx09BisqiIEfutPK2lhQDaekBOVDzxNiNrZS2C7dbNeNfKsabZ2lcpe/cPVIcAXw94WXAR zj1KEfinqpyrBCOzGhgoGpvmHksqSTY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733327576; a=rsa-sha256; cv=none; b=PpBJ6Fk2I5u88b9GyOeiu5wPNxaJXr3QnHsgWx5I3Als3UYCzfrNN6HkCnuqLtBAn1HyU1 TLVYUKZ2BqW1vTeCuOhV90zRuK6RyiuDaS+qjbbn/2eNx/mFXwqUDfj4Y7/58bTwT9fa35 gPdJa3TAUIsMTgyzpwrkbmUHaQCqLhk= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A8mUmlEm; spf=pass (imf14.hostedemail.com: domain of cel@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cel@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 027785C6E58; Wed, 4 Dec 2024 15:52:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3432C4CED1; Wed, 4 Dec 2024 15:53:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733327584; bh=N2kJlcrn9JOTM3KVLvrbjdtgeqhmJMuG2Y/zQp2C8sU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A8mUmlEmi1YX9VJXiiGL6ot4MnLU+An2YSxggSZVPZtdpsB9RZ4PPgT8dKAJKyMk9 QQGgo56Hqy0Yv8NjuXQckIsZRYBRaETkYPR+bNx90Zbp2M5xDQP2qBOn9NlK047AIt f2QtumEWqXAqPc3Ge1dUSHbJsXja/zQwjrMf6RzAAEGI6p0PMM1JJxUc9kh2ARHLiR sm73FgFFJ6rks2aNBTaq3oPFifhtWX5Rf5P65oyWaeNEwjlkYrwxRcT7+kKcTxgbce Wa9A+h2fYaKZ1oGXrXywzv0oGHgOQEbneNLsBYhFXbKSHl0fucmCyWQl/0AECa920h IYDC41rC1xyDA== From: cel@kernel.org To: Hugh Dickens , Christian Brauner , Al Viro Cc: , , yukuai3@huawei.com, yangerkun@huaweicloud.com, Chuck Lever Subject: [PATCH v4 2/5] Revert "libfs: Add simple_offset_empty()" Date: Wed, 4 Dec 2024 10:52:53 -0500 Message-ID: <20241204155257.1110338-3-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241204155257.1110338-1-cel@kernel.org> References: <20241204155257.1110338-1-cel@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 9931E100004 X-Stat-Signature: puyqixwt88ihjpyjpisaw4iaqepkygix X-Rspam-User: X-HE-Tag: 1733327569-135600 X-HE-Meta: U2FsdGVkX1+1U09c1K09vo0tDRrpHWzteH+eQNVkQQbLG3nPhufLIh/fdy1PhM0jyNDXUrylq7+VvpBFHtVdNrAj71h0C6WLLz2gx+7YyyMMLn4AoDfMTh5tEE5MwazkWuXTQGj52yXQXN2Kt1G2KZ+xqEJaqJdf+/NNfbQJpthc3+Rct0klJvF26xTG0gzNpwjKUB/8zoLvmjLytEkaiXWbHa4hfoP4IjtrOXMT14xWAd9MUPlYcT+z4kXvlCqnzFE2cBrGkMAnJ8HbvslC4BQHL0a3VK46es/mx0vHTBgBze5pSoGrloiqaivfLM40YjJiRWQzVzlxudQv28KoAkNBte9oDYt1k49C7EK3oMhoWIEJeBCMDgoEcZycked0YL66bFX9w2g24OPzswKRnNpfGYw5Y8CMOBmrpnhsRpI1rsrUFu6NU11BcQfBq7f7G+Z2uxDxvxQOqFDeBsZPeYVYdslW1washH2M4DG92ZQgjiJm+Baa34rUYfUBbP4wYmKS+I9fffHiaMCQZk/yaeKC9iXpH1j4VPgacxWggpmf3bwkAkfx/CwJSIzCH9UDkk2st8+GNoJJAE5NzoF4yGxHEQRAWhuJ5Ct/w8OLlbSTm2hbrd00jjDxLL9Z5XIgLw/TB4f5H0fj3DY+UoZg0iNYotmqR6kLwM2cDSatJVzDOmnFqUOUZ9JIjB8ZZAb6E/7O6RYlOXdm68npjaldKqdd3vwZ/OAyATLTKOb3dw8MH+8pPsFnTBUa4WnBQp0yVm1C1D2czRRDWxfJnncOgh1ez++jDvYhyn//NkoTQVaRt3OMZQ3KItd/qzPjldlzTzMUrUi+yLtUfaP270ttmnV2ReJZJVbBQq7M0h1F2cIUj9hMlULG48coQghPVTbOQ3uEpu7ED5/10/E3+L5JabW6Qr8Vsb9hrFnjEgYPqy0+KkkUUIG5djoW70sIW/bdSUsXHemMJ/VDlDp8wsy 4JKnofJp gBxtbktC9upy8f7DxCkTlR9a7Z1KG7D8WVRw4x0g1Iuj4Dchlp9Vx3CbEJRh7Uxsa4fiGZ7UQdm5j8Pll0FGx2JGQz/9pXn8/sAEXbrmjO0IcZ8hV6A96HOIoSg4TldOCcC2WOV2PAPRH4RsK3DuWpol3M87owrg8+NZ0uK48/h5dIXDIOA2G+yUDn2tbqMJQvZAaYgmeEIfn2wSMv5IL8djtnaVihLoZNPhkQcFDfdAo3XrjJZn3zck8l0W/Mmmv49vuJB7azuWMpmtnJDqEFSHXWw== 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 simple_empty() and simple_offset_empty() perform the same task. The latter's use as a canary to find bugs has not found any new issues. A subsequent patch will remove the use of the mtree for iterating directory contents, so revert back to using a similar mechanism for determining whether a directory is indeed empty. Only one such mechanism is ever needed. Signed-off-by: Chuck Lever --- fs/libfs.c | 32 -------------------------------- include/linux/fs.h | 1 - mm/shmem.c | 4 ++-- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index bf67954b525b..b668a4f5bbc9 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -327,38 +327,6 @@ void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry) offset_set(dentry, 0); } -/** - * simple_offset_empty - Check if a dentry can be unlinked - * @dentry: dentry to be tested - * - * Returns 0 if @dentry is a non-empty directory; otherwise returns 1. - */ -int simple_offset_empty(struct dentry *dentry) -{ - struct inode *inode = d_inode(dentry); - struct offset_ctx *octx; - struct dentry *child; - unsigned long index; - int ret = 1; - - if (!inode || !S_ISDIR(inode->i_mode)) - return ret; - - index = DIR_OFFSET_MIN; - octx = inode->i_op->get_offset_ctx(inode); - mt_for_each(&octx->mt, child, index, LONG_MAX) { - spin_lock(&child->d_lock); - if (simple_positive(child)) { - spin_unlock(&child->d_lock); - ret = 0; - break; - } - spin_unlock(&child->d_lock); - } - - return ret; -} - /** * simple_offset_rename - handle directory offsets for rename * @old_dir: parent directory of source entry diff --git a/include/linux/fs.h b/include/linux/fs.h index 3559446279c1..0698cf63346c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3434,7 +3434,6 @@ struct offset_ctx { 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, diff --git a/mm/shmem.c b/mm/shmem.c index 568bb290bdce..6ae963d42dbe 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3697,7 +3697,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry) static int shmem_rmdir(struct inode *dir, struct dentry *dentry) { - if (!simple_offset_empty(dentry)) + if (!simple_empty(dentry)) return -ENOTEMPTY; drop_nlink(d_inode(dentry)); @@ -3754,7 +3754,7 @@ static int shmem_rename2(struct mnt_idmap *idmap, return simple_offset_rename_exchange(old_dir, old_dentry, new_dir, new_dentry); - if (!simple_offset_empty(new_dentry)) + if (!simple_empty(new_dentry)) return -ENOTEMPTY; if (flags & RENAME_WHITEOUT) { -- 2.47.0