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 DD6C9C5B543 for ; Thu, 5 Jun 2025 13:17:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 110206B04EA; Thu, 5 Jun 2025 09:17:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EA31D6B04FB; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0B1F6B0500; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) 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 742416B04FE for ; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2717B1003E2 for ; Thu, 5 Jun 2025 13:17:08 +0000 (UTC) X-FDA: 83521397736.15.6A174F5 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf02.hostedemail.com (Postfix) with ESMTP id 5BEB180012 for ; Thu, 5 Jun 2025 13:17:01 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf02.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749129426; 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=BC8ye6wZqIC1Qc5B43YAFqEBtkKl8HjNy+891r3rGk0=; b=Kx9ta06ANHxDPMyJj5hgnfo9dD05fBV2ZcXc7EPPR6Mm8reoxMLiNNWm+INYwX36ihix+j WhIBSxqQGJ5C9t2/LM9GUxNymYgZ7NW6Px9/2IkX/sziQ4zFQpGdBU46hXyS+RvgNNqYIM lsmAsmVXQLLkImu6J27ycb3SlYqG3mg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749129426; a=rsa-sha256; cv=none; b=8N5xyx3ciUlUNcywTc4ilaSHasQsce950GYd3ALVtpUDSQrALyWYrVwfowWOKCGkQmprcl KWQBuvX9CosokCg8S72sA8ejdDtF6ncMSv9f0O3qxj3TW3hYv+qP0CGLF6ljq69l9EZW2d hFtGVPkcn0NbapDzM8yGK136EXb3l0o= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf02.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4bClND4VnJzKHNCY for ; Thu, 5 Jun 2025 21:17:00 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id 069771A0848 for ; Thu, 5 Jun 2025 21:16:59 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgDnTH3HmEFobD9lOQ--.29489S7; Thu, 05 Jun 2025 21:16:58 +0800 (CST) From: Kemeng Shi To: hughd@google.com, baolin.wang@linux.alibaba.com, willy@infradead.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 5/7] mm: shmem: wrap additional shmem quota related code with CONFIG_TMPFS_QUOTA Date: Fri, 6 Jun 2025 06:10:35 +0800 Message-Id: <20250605221037.7872-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250605221037.7872-1-shikemeng@huaweicloud.com> References: <20250605221037.7872-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgDnTH3HmEFobD9lOQ--.29489S7 X-Coremail-Antispam: 1UD129KBjvJXoWxuFyUur4DuFyfKFWxKrWUtwb_yoWrJw13pF n7Grs8GFWUXFy0krWxur4furyftFWfGr1xtrWDKw1Yy3Wv9w1SgF1xKF1Yvrn3Zr97u3yS qFs29a4DuF48G3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2 AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU s3kuDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 5BEB180012 X-Stat-Signature: 4191neph1mugoc15zenwy7zpp4k3cyji X-Rspam-User: X-HE-Tag: 1749129421-853592 X-HE-Meta: U2FsdGVkX190INpTle7cc5k+cB+SseLgf3ciZKKckzvJBuaa0+4FBQeOS74xd8Ktj+tmoTqyeZOUtJeSY+CVB4JUG0wqiOFY+w1LjNkT62SfXYRKEkF07WU6mFOMbxiyx3kqeXlARwOCVfvmgrXvqvsLu4RfHRZkVlOyJDkEYBhHGmnApVcfoki1l0m/CLbUFsXfaX6ueOWxiRiRSg+uySPJAlyiakNxPuyLtMoc0Fr+8LMgVG0R9P1H2UBSf3o6q2VMlq5XjOsaMNdITsYLx8hefR+GOUv20Yv8GCSC/h1S1mzfgNPvlEjdal9oqPxECL/YH41kHMzREg80e5n9VkxeYps5T5lUyt78/qtGYyfJyms70K1Y1bVXrtFG2kNM31oVm9SRC4JRsB7nsueWyH5kSkBc0HbgL4Klg1ZjY6FsS1lyxcNiGq0zuyHkYSUEdFPtW5XYKtrEZTalr2slVdY5T8uxR8lucAIxJtMj6poFX/UWawevDgUhGH51PWqnJ5T0I7lCk542A7zY3um3uSN5m8lN5EYKBtnfkrmMt5qtEvDCtOc+Is9vVopLGNCUuqYqPV/AdER+z3SORfN68KZdp+kt2bUNnpo5Jdh8H6aBKEsCXNzgf10wUw+OH090Fduo+y3vHbSiOaLXLBxwTsOEiY5gg1OAJ7azDWBTlBZvE3DuxgMCA9m25icGd5+CvuQWU2InH0q5IhQKg44e6oHoIluhe7NfKo4l3QCwQldO5w7hiocf0qlnilmtX/IQhsgQwj2bgH6mqdpT/CnKwUIiJb8yewKwxaSTZwzHynnSyCAYbJui/a2yzg5pjYJhGtynFRuhnahZxQfx83DXNJEW7Be7YLCOLGEOvzLe8bGrC5YtghelFDFHg45g6UpScKAwpfsU7oOSDbpERXz589tlQ8SUtPpuWXd8tdYENWdTECYV6s1CMEzpDdBjbmcuQdqNxCc1gDefKUM1S7E 9dQuraEn mSeA7x+kMlLcuvB0Fbxk+46bRgwb4FJGCKl+Bk0qBGVP93GX3qE+Hc9Mil0RNr8L/0HR35NItfg6o7W+y1KtknAMHZWNincp5r+cypp6S2W2/45nb8Hn07e3xvNKZ/CuKWpI8jKK5YinifGMqp9Z7ayz7+l/1pRQF1tzqCl8Buwzt6LNCYlqzPATWqb8gb2ChqqeYD2H3dTbPqxuQVb/MIhiCYQ== 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: Some code routines and structure members are unreachable when CONFIG_TMPFS_QUOTA is off. Wrap additional shmem quota related code to eliniate these unreachable sections. Signed-off-by: Kemeng Shi --- include/linux/shmem_fs.h | 4 ++++ mm/shmem.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 0b273a7b9f01..4873359a5442 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -47,12 +47,14 @@ struct shmem_inode_info { (FS_IMMUTABLE_FL | FS_APPEND_FL | FS_NODUMP_FL | FS_NOATIME_FL | FS_CASEFOLD_FL) #define SHMEM_FL_INHERITED (FS_NODUMP_FL | FS_NOATIME_FL | FS_CASEFOLD_FL) +#ifdef CONFIG_TMPFS_QUOTA struct shmem_quota_limits { qsize_t usrquota_bhardlimit; /* Default user quota block hard limit */ qsize_t usrquota_ihardlimit; /* Default user quota inode hard limit */ qsize_t grpquota_bhardlimit; /* Default group quota block hard limit */ qsize_t grpquota_ihardlimit; /* Default group quota inode hard limit */ }; +#endif struct shmem_sb_info { unsigned long max_blocks; /* How many blocks are allowed */ @@ -72,7 +74,9 @@ struct shmem_sb_info { spinlock_t shrinklist_lock; /* Protects shrinklist */ struct list_head shrinklist; /* List of shinkable inodes */ unsigned long shrinklist_len; /* Length of shrinklist */ +#ifdef CONFIG_TMPFS_QUOTA struct shmem_quota_limits qlimits; /* Default quota limits */ +#endif }; static inline struct shmem_inode_info *SHMEM_I(struct inode *inode) diff --git a/mm/shmem.c b/mm/shmem.c index 9f5e1eccaacb..e3e05bbb6db2 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -121,8 +121,10 @@ struct shmem_options { int huge; int seen; bool noswap; +#ifdef CONFIG_TMPFS_QUOTA unsigned short quota_types; struct shmem_quota_limits qlimits; +#endif #if IS_ENABLED(CONFIG_UNICODE) struct unicode_map *encoding; bool strict_encoding; @@ -132,7 +134,9 @@ struct shmem_options { #define SHMEM_SEEN_HUGE 4 #define SHMEM_SEEN_INUMS 8 #define SHMEM_SEEN_NOSWAP 16 +#ifdef CONFIG_TMPFS_QUOTA #define SHMEM_SEEN_QUOTA 32 +#endif }; #ifdef CONFIG_TRANSPARENT_HUGEPAGE @@ -4549,6 +4553,7 @@ enum shmem_param { Opt_inode32, Opt_inode64, Opt_noswap, +#ifdef CONFIG_TMPFS_QUOTA Opt_quota, Opt_usrquota, Opt_grpquota, @@ -4556,6 +4561,7 @@ enum shmem_param { Opt_usrquota_inode_hardlimit, Opt_grpquota_block_hardlimit, Opt_grpquota_inode_hardlimit, +#endif Opt_casefold_version, Opt_casefold, Opt_strict_encoding, @@ -4742,6 +4748,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) ctx->noswap = true; ctx->seen |= SHMEM_SEEN_NOSWAP; break; +#ifdef CONFIG_TMPFS_QUOTA case Opt_quota: if (fc->user_ns != &init_user_ns) return invalfc(fc, "Quotas in unprivileged tmpfs mounts are unsupported"); @@ -4796,6 +4803,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) "Group quota inode hardlimit too large."); ctx->qlimits.grpquota_ihardlimit = size; break; +#endif case Opt_casefold_version: return shmem_parse_opt_casefold(fc, param, false); case Opt_casefold: @@ -4899,13 +4907,13 @@ static int shmem_reconfigure(struct fs_context *fc) goto out; } +#ifdef CONFIG_TMPFS_QUOTA if (ctx->seen & SHMEM_SEEN_QUOTA && !sb_any_quota_loaded(fc->root->d_sb)) { err = "Cannot enable quota on remount"; goto out; } -#ifdef CONFIG_TMPFS_QUOTA #define CHANGED_LIMIT(name) \ (ctx->qlimits.name## hardlimit && \ (ctx->qlimits.name## hardlimit != sbinfo->qlimits.name## hardlimit)) -- 2.30.0