From patchwork Thu Oct 24 13:22:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 13849016 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 7C13CCE8E70 for ; Thu, 24 Oct 2024 13:25:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E7466B00B0; Thu, 24 Oct 2024 09:25:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 51FE46B00B1; Thu, 24 Oct 2024 09:25:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3519C6B00B3; Thu, 24 Oct 2024 09:25:25 -0400 (EDT) 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 1110C6B00B0 for ; Thu, 24 Oct 2024 09:25:25 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3EAEC1C6F94 for ; Thu, 24 Oct 2024 13:25:03 +0000 (UTC) X-FDA: 82708566822.24.04099AF Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf14.hostedemail.com (Postfix) with ESMTP id A083610000F for ; Thu, 24 Oct 2024 13:25:00 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of yukuai1@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=yukuai1@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729776270; 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; bh=7uLwY0hyujGf0Ih8MiaOjqB8vghLEY5Vz52ayh04nSM=; b=HxH5YuyVOrH3zauSHj6l/0sH0F0PAWDdS6HbGr6LfcJxuzRVeBrKFd6pHBPK5WfWStA7Vg sbz4Zxwq4jHVwM29FtxPG0rUQr2lYsOBzvYlvpZyFjD8wPTFtkeyIpVI7ru7T38nUe4KMB 3Z9hkp/jHZynZby1Swpo2/BkvhutHAw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of yukuai1@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=yukuai1@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729776270; a=rsa-sha256; cv=none; b=Wvg3oq1SCAa73rQeZK/Cg5VjfHeNgFLG6W0MB02bpHqSBiEJ+/Hm2ER2h8cutoSI/Fa0le Rueo9nsazmL+1sbHdsgRSfyNEEi7T1WNGfWJrNvkia7U0vd0QioGtRag0RyH2VSZbHQmVG O63ynfBKyerAFCicWUqcDeT3eibHyy8= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4XZ68q0bLWz4f3jdS for ; Thu, 24 Oct 2024 21:24:59 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 88DE51A0568 for ; Thu, 24 Oct 2024 21:25:16 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgD3LMmxShpnmfz6Ew--.42902S11; Thu, 24 Oct 2024 21:25:16 +0800 (CST) From: Yu Kuai To: stable@vger.kernel.org, gregkh@linuxfoundation.org, 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, 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, chuck.lever@oracle.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, maple-tree@lists.infradead.org, linux-mm@kvack.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH 6.6 23/28] libfs: Define a minimum directory offset Date: Thu, 24 Oct 2024 21:22:20 +0800 Message-Id: <20241024132225.2271667-8-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20241024132225.2271667-1-yukuai1@huaweicloud.com> References: <20241024132009.2267260-1-yukuai1@huaweicloud.com> <20241024132225.2271667-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3LMmxShpnmfz6Ew--.42902S11 X-Coremail-Antispam: 1UD129KBjvJXoW7uFW7Zr47XFy5KFWxGw48JFb_yoW8Zw4rpF ZxCa1ftryfXw1xWayDJFsFqFy0gws29w48XFZ3uw4fAryqqrs8K3W2kr4Y9a4YyrWkCrnx trs0yF1SqFy3CrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr1j6r xdM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0D M2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1Y6r17McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2 IY04v7MxkF7I0En4kS14v26rWY6Fy7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY 6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWrXVW8Jr1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI 42IY6xIIjxv20xvEc7CjxVAFwI0_Cr1j6rxdMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCw CI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26F4UJVW0obIYCTnI WIevJa73UjIFyTuYvjTRGg4SUUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-Rspam-User: X-Stat-Signature: b8imexrwn56pp8sjouwttzp57dc5mqgq X-Rspamd-Queue-Id: A083610000F X-Rspamd-Server: rspam11 X-HE-Tag: 1729776300-944287 X-HE-Meta: U2FsdGVkX1/F9lCIj5zVMBMcvK5as6+hRBQDCex1J0bAIMQCflRkwtpTTOUdOnMjl/X89FSkZAAf+oHWRrIkVvSldln1cCgErCGP+2BtEHcYaLqXe+BjDArA750lbseDg+3vUjU4p8nzH7coeCX2UDEnr7xCCmA9x/zuYT1/V+d6F8Ay0qME1t/1hZZMX4uc9ckl9KBHF7+1SPUa/K8Vu0MNIIVuu7G2Lbhjpz5a1cwudGhsNxXMB4S+HAXYIuqjpLUT9e1711EVZY+lJq7HyUYsdipNVYPQve4rY80R9joyJI820Ohm8r3MX2eVxAwsK/VTcL2gziA0Oo0LEWYKdvzK2UCdkheLwo4puJwK/zasrtwfGiNvszZghGs6OZ1+EyGIFo7FDAaqrgYLZmHmu6qsnDdEj3GNPPzWiHJTr8XsyRU3/XUdUWiQpCpg7lC8/A29OpahwMvV2wfIshgb4yYksxye+XSVferuAqcLo6nKqfuDAel5Ig5b6EUVBtWvxvFLG7djWtq14Js3OFR1l8cMKiDluNI23Z/8YBF0w50SQXy0w//b80op1XOzOSfdZZ2VBRBdrMXUYyWFf5qONgw8+zfqVUsCX/tmmmMeika5mkxKZs4om7CZbpxbp92dBJDeNeEzjwUPu5Od2tgQ8TZDGJg0UbfeGGpaXHLcAAtgd/75aKtpr4OtAMwiViom7QxGSEBDxJ0rK8hMf0tRdsaj/OQYNr0ddkc2NrFQLiajtKoj19nSHo1JKSQRe/SHx3dyxB/isAhoxlPFgegS5wArIACs7TFEuEu0ggHvmj8ZOq6eOw2GqCqGuJsmFyPCInqZDYxnNOrj94eS1p/kz0Xf6E1or/q8fBrQRI36IDPd1lGjhBNriZQq1rVzGgKW69pqOtG1kknGQgfNqWP19fijDHLgeiZkABcmu3S+NcYTV195GS/La9vQ/C3thbE6mRy9rwZqcfZYJmyjuSt BAZ+slUX xRGzOGzpImFk3IZlJY9XyJu9t++4lNzKMTox9RBKQJs2qhiu6j0dZwrMlVqpF+0yvSjkMo1qZqpW12+XzB052Z6U68asBvF2SrPsfqH2zI7KJ61z2fsLgySgdd1YOWe22onCG/ZGcw9GSPdaRKkWlduwOAhTTZbNgTRBTGW82ptOD/GEvhFPv+enFHNiQBeAAleno9+FmVUE6b1I= 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 commit 7beea725a8ca412c6190090ce7c3a13b169592a1 upstream. This value is used in several places, so make it a symbolic constant. Reviewed-by: Jan Kara Signed-off-by: Chuck Lever Link: https://lore.kernel.org/r/170820142741.6328.12428356024575347885.stgit@91.116.238.104.host.secureserver.net Signed-off-by: Christian Brauner Signed-off-by: Yu Kuai --- fs/libfs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/libfs.c b/fs/libfs.c index 430f7c95336c..c3dc58e776f9 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -239,6 +239,11 @@ const struct inode_operations simple_dir_inode_operations = { }; EXPORT_SYMBOL(simple_dir_inode_operations); +/* 0 is '.', 1 is '..', so always start with offset 2 or more */ +enum { + DIR_OFFSET_MIN = 2, +}; + static void offset_set(struct dentry *dentry, u32 offset) { dentry->d_fsdata = (void *)((uintptr_t)(offset)); @@ -260,9 +265,7 @@ void simple_offset_init(struct offset_ctx *octx) { xa_init_flags(&octx->xa, XA_FLAGS_ALLOC1); lockdep_set_class(&octx->xa.xa_lock, &simple_offset_xa_lock); - - /* 0 is '.', 1 is '..', so always start with offset 2 */ - octx->next_offset = 2; + octx->next_offset = DIR_OFFSET_MIN; } /** @@ -275,7 +278,7 @@ void simple_offset_init(struct offset_ctx *octx) */ int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry) { - static const struct xa_limit limit = XA_LIMIT(2, U32_MAX); + static const struct xa_limit limit = XA_LIMIT(DIR_OFFSET_MIN, U32_MAX); u32 offset; int ret; @@ -480,7 +483,7 @@ static int offset_readdir(struct file *file, struct dir_context *ctx) return 0; /* In this case, ->private_data is protected by f_pos_lock */ - if (ctx->pos == 2) + if (ctx->pos == DIR_OFFSET_MIN) file->private_data = NULL; else if (file->private_data == ERR_PTR(-ENOENT)) return 0;