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 74E91C0218A for ; Thu, 30 Jan 2025 08:59:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 050BB28026F; Thu, 30 Jan 2025 03:59:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F407A2800D0; Thu, 30 Jan 2025 03:59:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBA1028026F; Thu, 30 Jan 2025 03:59:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BB0192800D0 for ; Thu, 30 Jan 2025 03:59:48 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 71FE51C758D for ; Thu, 30 Jan 2025 08:59:48 +0000 (UTC) X-FDA: 83063520456.19.88288F9 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf19.hostedemail.com (Postfix) with ESMTP id D159B1A0009 for ; Thu, 30 Jan 2025 08:59:46 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=gPIK+mGL; spf=pass (imf19.hostedemail.com: domain of gregkh@linuxfoundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738227586; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:dkim-signature; bh=w92qkybfRWIudQFteu92qMehyhUBpQb/cKL6vRgvLlk=; b=a+uwn2iDNVVP4o+oKk/FD29ZNH75HviMViW/oyWCxzbiJtf8X8HXjuTGrHkXl5nAFIxqln RSQCO+wehv+MIZF1ifLf9Q/e7eJgoPSVuTvU+9xl5cfeZ3Aec7e7sbxrBezdnt3l63KObn XibYeaQxZkze03WksublQbZqlnLMn6Y= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=gPIK+mGL; spf=pass (imf19.hostedemail.com: domain of gregkh@linuxfoundation.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738227586; a=rsa-sha256; cv=none; b=YAJypg099JrKCxygc5DzWQipBq7tP3D7y+eigLQK9FbLErY0Sp9Qqnu9kYB/bNLj661dM1 54xdtqh16TlnFjy9O1s3malaT7TMkbW01pRM/AI4szHG2FfdFiBvqC8NzAjUIdHLRrkzq/ I2zSXCXFHluUlH/WpvkqbnNwFSJ9rRs= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 92CDBA41C0D; Thu, 30 Jan 2025 08:57:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 971C7C4CEE0; Thu, 30 Jan 2025 08:59:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738227586; bh=vglnvxM1lQ4q30a6MXcNWKW+GKKcivkB1nnHZeuvG50=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=gPIK+mGLPyAQxLXMf+X/EyZ7iSs2ZyhFnU6qRiBpQvCwS/OxVV/lJMi+8RqffSwt7 1iQ6qnrG3Y/1C4/F0JCTBKS5L42BWdrnHQ4Coou+Vh1ZKEfGpsQRjI/1kz8qhSxAwx X9RgdH3W5/m99La8WSnCLt/uYFDLRAgUVE7Svec8= Subject: Patch "libfs: Define a minimum directory offset" has been added to the 6.6-stable tree To: akpm@linux-foundation.org,brauner@kernel.org,cel@kernel.org,chuck.lever@oracle.com,gregkh@linuxfoundation.org,hughd@google.com,jack@suse.cz,linux-mm@kvack.org,sashal@kernel.org,viro@zeniv.linux.org.uk,yangerkun@huawei.com,yukuai3@huawei.com Cc: From: Date: Thu, 30 Jan 2025 09:59:30 +0100 In-Reply-To: <20250124191946.22308-3-cel@kernel.org> Message-ID: <2025013029-equal-dill-9639@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: D159B1A0009 X-Stat-Signature: t3m7yo5kqq7z6appdkx178wy5rudmpzi X-Rspam-User: X-HE-Tag: 1738227586-835815 X-HE-Meta: U2FsdGVkX19hRnKnFNzR90mnXe/vwIbL8iiL45uoM5WF/tGj0X57VQ/+7YHO7zTG2I4pucOQGKfzTw9Z4xsZnVfW2eqS6VgU1e0XQLjncoSLqhn5v3taIDup5QFs69TqCivmOjaXwAwe8FbJ3O9+9SbRTpzUs6vtdFbvVgfZT809+++KCFcZ6HY0/1ye/hZ6/xKUd28DFtntrV0EBO/0Ly16M3nlWzQ1lCrabS26XHx0JY0faiEYTQpmnpKXazFh0O/24DFdLm02p7y/T0toELVRwYzU+EVRNItE998oyECKFGR8c/ZbO72pT+jIQF5I3vx7PKP557an1RN9cbwNb1vcXInaygCwDnNtrcBS5sMn0HkkhQTvxOCHhE3M1ZUOxIHh88c90JUQuvfIWPiCUr6EDk3WmBrpF/BwVB4blItrObzoLVyJiB4d+oNOj6mtpMnkbK6DZ/2YGNWu9ELTUn8C1EuEPmiFOJQIbx17bLL7H9hEwY3/MFF0UQbdHyCv7m3Aep6u1nYTbADAKBAv5bXUg/gMK+uzkDkTbR71Us8G/dSeraDlWJKSEYg3AUqWl6tPvLpwNC1B4e0gG4fayQCkJmNYywbFjO0rHfP/v8m8NQM5faxo7pXbBjoUnGmh+vIUMd3NgF0/sAS/fRJOnCKgndy+nhlvatJti9yg+bIjG2gWVAD0KL5Dfm93iNeibPhRh5WO+rEOlXEabxHr2GVLLTtM2QCFAZOmird2EYSXCqmab5rAHCNgF/YMbz//S/ND6v+qHudSt5lgdbcihNHC+a3lLxbhMEqKT2EZ7soG18I7bld9yj0wPcPpevk28ZEPQ4zk4fJI38RDU06jEErYAK6tDSYm3GZ90gch6F5ru2jnJYbbj3/O9ivfVyzi2SjqeF+AshnvM+F08zlLlKVp3DuxUrYKJqeRh0fbIMkSMbo/6QfNOb3nLwvbDsJzz8bnTL+OFIWB0imKjeC NUDXD3HV nhN4uzuXKZKo3YGjM0dk6tkSzEJsQoIFEG/Xc2ZdkjCP2xfB6J/atfMf1c3RFMLcwWq246+IzKMbxUk18HqeTV3TbJ3nHl/Z/lYszREU3oNyT19C2+zkY3s6HF8A6XodwhsebHl80BOQXEKgXUXfGRSBKKbjAOFAdyAuK1nBSp84vW8iptrkGdVuxdl9vI2ksd+B9EjoH6vI7xi9rcGUtyUDJr04D2McNvM3K73uYq9pKBJAZ2XN+zaZct7ZiSHpFk8Q938kPYB5O826ZHmpPL/vBwwUR0tVkigSo+4pl7IjVfS4lOokOm1z+QMSh4BLoO6Gp5NG7E8RYjJzdLEFIgU0G6k4kZrvkQsGdoxCL8uJTEZWi+Sd3v70OCzrVpUXiG7lhpcL3cVSUTaPGTyvXMyxmy0MLoDAplPoQfBdNZMpizb1yb4/4JirFb7csid6xYe2uwx+wHxr31aRSWxYzgFN0RRlaYjEOH9TNtghEbJ+X221i6KxHAVW3+tW/uBircfIq8zyI5VpKpCt34F66eH2uwrLyZvHc77GXxUKHsNR/amCea3ejy5hKaTaiFI3f/wu/xJHPMtSU5gJ8pLtsKXS8SuAQhaH9LMqYJNwIlGH7PSNPaKAKngtQIW0YkgeCDHRWsn30qLUKOPc2aZVeaOseidjNIM7l8dJKmrhI7aJj24QvlqUobweNDlZLtIvbLC+s9jQ3+6ferLDYwNV2bbQom2kXhOCkfm6KxylMY2Jbj6g= 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: This is a note to let you know that I've just added the patch titled libfs: Define a minimum directory offset to the 6.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: libfs-define-a-minimum-directory-offset.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable+bounces-110402-greg=kroah.com@vger.kernel.org Fri Jan 24 20:21:35 2025 From: cel@kernel.org Date: Fri, 24 Jan 2025 14:19:37 -0500 Subject: libfs: Define a minimum directory offset To: Hugh Dickins , Andrew Morten , Christian Brauner , Al Viro , Greg Kroah-Hartman , Sasha Levin Cc: , , , yukuai3@huawei.com, yangerkun@huawei.com, Chuck Lever , Jan Kara Message-ID: <20250124191946.22308-3-cel@kernel.org> From: Chuck Lever [ Upstream commit 7beea725a8ca412c6190090ce7c3a13b169592a1 ] 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 Stable-dep-of: ecba88a3b32d ("libfs: Add simple_offset_empty()") Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/libfs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/fs/libfs.c +++ b/fs/libfs.c @@ -239,6 +239,11 @@ const struct inode_operations simple_dir }; 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_ct { 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_ct */ 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 *f 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; Patches currently in stable-queue which might be from cel@kernel.org are queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch