From patchwork Tue Nov 15 06:35:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 20209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2551146wru; Mon, 14 Nov 2022 22:36:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf4xkYPfkD2BaUoQTikkK/GDb4uOXoQP82HWzG1eMOA7MC4a37mLOooTVE+X5CLfqohwj835 X-Received: by 2002:a17:90a:bd0a:b0:213:aa5f:a026 with SMTP id y10-20020a17090abd0a00b00213aa5fa026mr655638pjr.243.1668494184119; Mon, 14 Nov 2022 22:36:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668494184; cv=none; d=google.com; s=arc-20160816; b=zOexYkVBP27jIZvXYmRm3qtP4qJjISt9vXgYifkvkWTxG6gREdj2Y8xbVjtIxGhdcS ZwpA+Tb4Zy+l6ou5aiGxPfIUhW5H+0sZOTt/aeiLfrwfVE3dJjpmQNACa6rlM1lqgKBY djdCpRMiQNPGIbN9nYf+9WLrGjXWTN/4Ne+1t1IW3vcrO6jMAWORhSQ0MewsOTo3fM5x x2qv9IKlyJqLNBi78OH2utbqpMCicbvfs5PBel3VMPQZVaEp1ubzdLDYfJME3CgjaAJt Lohuchw0kHAa9shlPVC+Ur3EZnqfG/2nDPWyI5UqRuhk8v9RqoIy3wFQT6o6wz1f+bVy 0w6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/ddiJyfTyZKuawRH0HdAalthgL1Zu6o7Dm/cACdaVe8=; b=pDk7vvw0dAIVFBtaH10Z69RVQ9wQXmcd4CxtsYL89RQXAg2H7ZnFZV+laRmtmDddcG pCTKiwALqmWBXkX/pPNAWEMv3BX1cOxlhx/vauJPdRbJGVaH3hTGF3bnroVKAMdYlCXM WUq6z5jSQ4PFQKvf57xbanpXAhBGtrnS6dt0MzDmO4fCqW88UcKlWShtdXcAftLpOVLD EsOONF5M139xCWICWHkDBTLbsd1VXW/E1UG8h7Qi1FmVFdtX+ddfkjS9K4Nr9F6ZkgYv 1p6zDnGsvu7BNrKXbx1gIfP+OMxeEEfJYAV5ngEwwPUEHdBn/XKtsgPsGYPB+lKOWTpf +ShQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fbkTPJI6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f127-20020a636a85000000b0045a2b6e1192si11277530pgc.233.2022.11.14.22.36.11; Mon, 14 Nov 2022 22:36:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fbkTPJI6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232249AbiKOGgB (ORCPT + 99 others); Tue, 15 Nov 2022 01:36:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232254AbiKOGf6 (ORCPT ); Tue, 15 Nov 2022 01:35:58 -0500 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 615DC1EED8 for ; Mon, 14 Nov 2022 22:35:57 -0800 (PST) Received: by mail-pf1-x42b.google.com with SMTP id 130so13238075pfu.8 for ; Mon, 14 Nov 2022 22:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/ddiJyfTyZKuawRH0HdAalthgL1Zu6o7Dm/cACdaVe8=; b=fbkTPJI6AdjhHDOAYjXNCRvWLJeS+4Nq2CAHj74eUDoT58ti3q7omrhHGT6kh9kPW/ XzjFIkVr8Tn8MP9JmIjaP4QwFoVn8SLybhGUCBbshXXfu3QO7dNAH/c5UHbHVRjYDjVk eLWK+INryeHrOewUQ0vbC9CrqVVnZP2C6SkHF21q4rME3D99xtuRIYY6+OcGBFG6b8GE f4UyxTVdg71A+NJ0wDStJ1Y8oc1yZFKannJGbTc++xbcYfN2vrMvs4IPQ4DpIBajUD4J I6GfuPFaY17savOj4LdfTErn8YcC65VAbKJXF/Nq/HpRZzRzlNsaPSeE6kEiHTpRLTlQ Ks6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/ddiJyfTyZKuawRH0HdAalthgL1Zu6o7Dm/cACdaVe8=; b=JAqafPaUQBtWm+WRY1WfGP968VS57K/uv3YNVTaKCx0WlHN01DeegaIM7sZDYYpA7q JoA0ZBzjqrw2GOwytXlRqoQUs21QWABqRETiFqRPTn9Tp5JqE9LAg1vZbM8t3QrpmbeT 66F2luaBnENgoZlCab2YSOJJ2lDyQv/OKVB8fhgn9rsUGeEOgc4arUtsje80RcfjM0ru cbr3xI9ykVk7zU5rL4GCl4wtXiF8trRnsUuHfiUrIlDS8AFskk+G2CZ23UVh4a6KmlSr 8UpTxo5ZXnB7wTnLXsvSUtcTnegL5NwdtSFnDCVCLSYCx4VIDu8QHFf6241bIqeeib8b 3taw== X-Gm-Message-State: ANoB5ploxJWmk6TbW4T4q1U82ze4FM/O+lX192XefD1akGN4cdZ3dYh9 6J/Us8jnL90xyQPr8/QlYeI= X-Received: by 2002:a62:1a10:0:b0:572:6da6:218e with SMTP id a16-20020a621a10000000b005726da6218emr1986865pfa.1.1668494156965; Mon, 14 Nov 2022 22:35:56 -0800 (PST) Received: from VirtualBox.. ([129.227.152.6]) by smtp.gmail.com with ESMTPSA id e4-20020a170902d38400b001822121c45asm8767874pld.28.2022.11.14.22.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 22:35:56 -0800 (PST) From: Yuwei Guan X-Google-Original-From: Yuwei Guan To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Yuwei.Guan@zeekrlife.com Subject: [PATCH v2 1/3] f2fs: fix to alloc_mode changed after remount on a small volume device Date: Tue, 15 Nov 2022 14:35:35 +0800 Message-Id: <20221115063537.59023-2-Yuwei.Guan@zeekrlife.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115063537.59023-1-Yuwei.Guan@zeekrlife.com> References: <20221115063537.59023-1-Yuwei.Guan@zeekrlife.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749542957822519079?= X-GMAIL-MSGID: =?utf-8?q?1749542957822519079?= The commit 84b89e5d943d8 ("f2fs: add auto tuning for small devices") add tuning for small volume device, now support to tune alloce_mode to 'reuse' if it's small size. But the alloc_mode will change to 'default' when do remount on this small size dievce. This patch fo fix alloc_mode changed when do remount for a small volume device. Signed-off-by: Yuwei Guan Reviewed-by: Chao Yu --- fs/f2fs/super.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 3834ead04620..17b9e70b8f32 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2043,7 +2043,11 @@ static void default_options(struct f2fs_sb_info *sbi) F2FS_OPTION(sbi).active_logs = NR_CURSEG_PERSIST_TYPE; F2FS_OPTION(sbi).inline_xattr_size = DEFAULT_INLINE_XATTR_ADDRS; - F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_DEFAULT; + if (le32_to_cpu(F2FS_RAW_SUPER(sbi)->segment_count_main) <= + SMALL_VOLUME_SEGMENTS) + F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_REUSE; + else + F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_DEFAULT; F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_POSIX; F2FS_OPTION(sbi).s_resuid = make_kuid(&init_user_ns, F2FS_DEF_RESUID); F2FS_OPTION(sbi).s_resgid = make_kgid(&init_user_ns, F2FS_DEF_RESGID); @@ -4060,7 +4064,6 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi) /* adjust parameters according to the volume size */ if (sm_i->main_segments <= SMALL_VOLUME_SEGMENTS) { - F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_REUSE; if (f2fs_block_unit_discard(sbi)) sm_i->dcc_info->discard_granularity = 1; sm_i->ipu_policy = 1 << F2FS_IPU_FORCE | From patchwork Tue Nov 15 06:35:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 20210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2551205wru; Mon, 14 Nov 2022 22:36:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf4D5dS/lwhYXzxy0yCc5ZF4Zcd7aVFR9ZkNtpqC2SyB6Vmi0AUkxgZ/KUbqP+FxkpAOguBQ X-Received: by 2002:a17:90a:b78d:b0:213:625e:896b with SMTP id m13-20020a17090ab78d00b00213625e896bmr691239pjr.175.1668494197226; Mon, 14 Nov 2022 22:36:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668494197; cv=none; d=google.com; s=arc-20160816; b=c9k8QZcNUZXJ+fQu9XyNnshdKCyziN3PrQo1gHBG9l7avRSDax/iYOXRuStKDKh/s9 sNrCXZycH8ZM6ghIYks3d2uguRKwprTZPfWsUMKn7ISgh/ZIXqZ5ihpsxivjzpn1RCUj Cw12XnsIO4NXtYx/XinLiRL+5WBXHgEnPdn7B41L33qXnI47e7hewHaXG3JVzH/TWn+s z6pJRPMLirP1wH5yx8h8By6FQ5yezfY6JF6P1ZgqmZoXiWOpZIGl+3f4WDaPTvnmjNnI TBWCy17lhnPPa6XkPFA+BP+ImYj1BvG/luYaatwNPXTAitihgJW5e4WzszrTNFaYumHJ NB2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=At0DMj7QmxXhtx0rqE/HVuXuFAjGeJogide/J8J9NtE=; b=S97pzCewaUrztALB3ovSeTYqQEAPSYIVBZroMzaL6YDid7NsRjYJRw5oa2VlStxUVV X6DHRLXMwoBpD/zWzyxI/CzyVBgrFDpIaRSW3fSXkoqefbCBtZOTgop9ow37rgBrEYe8 ays6rpAnIJFj7wBfdVaVlrnvI9IDDNvHpt2ns58dhSDuO/BfYC45xDfk1eXTmliLUDuV Zvkux6K7vKlEUW0o+ExZW8B1E0VvyU6sqMb7SpD8s9zvzaVwAZ3bNAjKyuZW4aYpQ070 2/OZ72OxFCq6l1uoyBRJrNs75mioAlI0cy9cM081wf71LkveZPRclpXD+U5og6/M6TOn Y1jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NwwCJKF+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r5-20020a170902e3c500b0017eae5cc961si10145490ple.306.2022.11.14.22.36.24; Mon, 14 Nov 2022 22:36:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NwwCJKF+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232254AbiKOGgC (ORCPT + 99 others); Tue, 15 Nov 2022 01:36:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232248AbiKOGgB (ORCPT ); Tue, 15 Nov 2022 01:36:01 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 870561D670 for ; Mon, 14 Nov 2022 22:36:00 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id k5so12443834pjo.5 for ; Mon, 14 Nov 2022 22:36:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=At0DMj7QmxXhtx0rqE/HVuXuFAjGeJogide/J8J9NtE=; b=NwwCJKF+znEhRh360dhBKRYvY664rqbb3Q6CjoAruwbU0hB6fIx6iN40Hr23MLUIxx akhV7pXA0Lca6e5ZmWhsG+cCqLhXrgIapmOtSMTAx25jIf+N58eF9Vh3hkuHlgH8wTNU tR0YCeOQdmoMxw+rsRd346ey1quUzS/tif0sXPCWUiaTVM82mP2uNeFcginMnz/I3kPJ pGEsCnwk13uc7lRSsWP85Zp9XzMRFnEyC86lv4iwRE03JYmgHsIPjGvlvL2ajafLJXB4 /zgF0XKBkDGOMoZomtMfQrACGtD/nPXqoiwm7sN8dzFI3c1RdPc04zolpw8Sy4bpg7Ay J+3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=At0DMj7QmxXhtx0rqE/HVuXuFAjGeJogide/J8J9NtE=; b=HIcV+dRbzCwYAgB8lfzo6wgUZQfzD9pJZIGD5wVVkwJF2IrCk51oqlEHUhVW9XKkPi qNIENc9Wm4Rk6ZV8s8eJUZ2D2mDL3SR1bLxdLzmhl7r9scKFS+hNHPkjbcYFR7s36UVy o126yqk1B/k8gffO5iCQlnuYIRQq8WXERgz+LnGxhd2XJsXJHsabOoExMTb3NkzmZ8kM xkuPHSu1YGOcaifE7Jq7TTpYyNYBKsPLYOKh7iFuOeSi53qzkW3h2h6r5w1vZigvlzfK TPYgyP4xLdd1QYB5AN+acGNsxK2JmaVn5zxDf/T95xkxNpFg8+t9uYj5wJ5wN2MI+yrq uJxw== X-Gm-Message-State: ANoB5plD6M50kI8AF4AKyZhfM9dEkAGeeoGv6yLKUYuAJ+Dy+k1HE4lg 38fqvgpyt/AdzDmtLXSb3nI= X-Received: by 2002:a17:90a:d517:b0:200:40a2:eaaa with SMTP id t23-20020a17090ad51700b0020040a2eaaamr764941pju.68.1668494160103; Mon, 14 Nov 2022 22:36:00 -0800 (PST) Received: from VirtualBox.. ([129.227.152.6]) by smtp.gmail.com with ESMTPSA id e4-20020a170902d38400b001822121c45asm8767874pld.28.2022.11.14.22.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 22:35:59 -0800 (PST) From: Yuwei Guan X-Google-Original-From: Yuwei Guan To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Yuwei.Guan@zeekrlife.com Subject: [PATCH v2 2/3] f2fs: cleanup for 'f2fs_tuning_parameters' function Date: Tue, 15 Nov 2022 14:35:36 +0800 Message-Id: <20221115063537.59023-3-Yuwei.Guan@zeekrlife.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115063537.59023-1-Yuwei.Guan@zeekrlife.com> References: <20221115063537.59023-1-Yuwei.Guan@zeekrlife.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749542971125713770?= X-GMAIL-MSGID: =?utf-8?q?1749542971125713770?= A cleanup patch for 'f2fs_tuning_parameters' function. Signed-off-by: Yuwei Guan Reviewed-by: Chao Yu --- fs/f2fs/super.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 17b9e70b8f32..3e974c003b77 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -4060,13 +4060,11 @@ static int f2fs_setup_casefold(struct f2fs_sb_info *sbi) static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi) { - struct f2fs_sm_info *sm_i = SM_I(sbi); - /* adjust parameters according to the volume size */ - if (sm_i->main_segments <= SMALL_VOLUME_SEGMENTS) { + if (MAIN_SEGS(sbi) <= SMALL_VOLUME_SEGMENTS) { if (f2fs_block_unit_discard(sbi)) - sm_i->dcc_info->discard_granularity = 1; - sm_i->ipu_policy = 1 << F2FS_IPU_FORCE | + SM_I(sbi)->dcc_info->discard_granularity = 1; + SM_I(sbi)->ipu_policy = 1 << F2FS_IPU_FORCE | 1 << F2FS_IPU_HONOR_OPU_WRITE; } From patchwork Tue Nov 15 06:35:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuwei Guan X-Patchwork-Id: 20211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2552219wru; Mon, 14 Nov 2022 22:40:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf4PO+WfAcbOwkxO5AnVMrWKEI5csuy4yAK+xQ0e0/D+EgTvk+S8K12hjoYW2c/CAoF2si1r X-Received: by 2002:a17:902:a70e:b0:185:3659:1ce9 with SMTP id w14-20020a170902a70e00b0018536591ce9mr2683732plq.26.1668494408263; Mon, 14 Nov 2022 22:40:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668494408; cv=none; d=google.com; s=arc-20160816; b=0twDSjwrqzxJem1u8r9Qh78AcSkuuBw4Tft8vkDnnw5Bz82wg0Q6W3D9IiazP1gbcg YhdQVBhi+kfOlExEzrTfwZvwHpUNRmetd+NU3fMpJIhkmEMoa3y3czg9JHHAtgwJ3b4m RxajNKjy6Am9qopcTq9bUnWjq1KweEXXMsM9LZ0sl4BvqnSxNeKlRnYvLxk96xE1xI4r NCnwKQUuxK3OPpldXTR0dyF/1KGGgiM1k0Fp9lN+u/J2XvkEUiLEkJeaFkRo3katng5W 42gOxMwTbgfy64roNLzfv1U90GYzecPh7Vyr+2UnvgtQ9NjkZPhsqkcD0jZTXlI1n0uh khMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+HKZAEUVQQUBttDmyc7IKUPKjfreDh+ajk8XM2NRY3o=; b=gYHZvWXH+Q5eu+D45TayR0EDoFbmjN+gY2ARSq923zVr6wuZjch93ULHFa0N07+C/5 GGFGYR8CROSucyUC4VxYn+T0B087Iiqntmb1ONOyOT9Gpomo7ZTWEf/Z122nL01TcxJC ZkjRRiWbziwYrrvS7FgrRBnlO0mZ1oybZcHl3uWBjz07B/AWEqaY2O7qygIfAJ+essWB uTPhmtOmqvHg4LoJbszj4kCQHxlpviW/sOk7WEqf5dJzyVQTeC0kmWaH1D84bt8A8jjq BMs+zZ+SH3KQc5JiGPXq8jzBVqcu5WBtqIyDv0r+kOKzbGJZX7Uk6pRnHGc/06YN3Ck1 s6mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=a4yJy1oo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z19-20020a170902ee1300b00170f6f728d4si10832930plb.543.2022.11.14.22.39.54; Mon, 14 Nov 2022 22:40:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=a4yJy1oo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232276AbiKOGgK (ORCPT + 99 others); Tue, 15 Nov 2022 01:36:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232334AbiKOGgG (ORCPT ); Tue, 15 Nov 2022 01:36:06 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0C051F2E8 for ; Mon, 14 Nov 2022 22:36:03 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id j12so12288227plj.5 for ; Mon, 14 Nov 2022 22:36:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+HKZAEUVQQUBttDmyc7IKUPKjfreDh+ajk8XM2NRY3o=; b=a4yJy1ooSkHn+oYyYqCVoMQVZzD/uU5LFhOK0nPMBaEpYkghqShsP/rETQ1BHs3HXe Mty1rEssYGt5wbQmyhAEQGzaLj3QyYSHjvB8UhQKQ28xgmfxW5X7KydjCIbc6LfRS69H 1mxMokS35vYoggGeNRZvbkKyNsSwiLASJuLqZNTLiwlrYLrySOYaEwJL0r8GsTRu4IvL EBzJSjb5XODMKQHHInsT6rpxccfOeXgs7ViB9j6h0xJ1/N8jd6q3C2lIu04kAx3EIQQ+ Yl2UUgfahLk2gRljblLqXdHpHboy37jImoK2/+B2XV5VvITePgTI0jlyQvwmIUCKHG9E utng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+HKZAEUVQQUBttDmyc7IKUPKjfreDh+ajk8XM2NRY3o=; b=oUCOmML16i9PKVnxWxjfTufSurUHVHJsnmws/BewmWUvT2gn0QFn5laocvHsn2LmIi SSJ4Xbado40mSw3NGY/VR5RaBrR1QBz1eaDWgI5ZxnZT74jCpGGq/JUNoeOiej8F/T6J hMuWW3gFBxOTZ5zkjEGQgmPVbRJDT7aJnbor2s30JCLRrLxFIeGOxewxge3eIGs1GJ65 fHZJSs6E9+SWnEaL2FBt3ma5KGrRtnvGRYTOIRjaUCS2Hcn1rSQZkbFrAeDO/SKltFZl UwS8vckMpoc1Em/fD6of9X4fhyLANLvsuq33lf5B2HjmIRt76uIbrMbMBbpNLRSRhCaR prjg== X-Gm-Message-State: ANoB5plEQd0Q3IFQslzE18zm0ErJv7RCSslV1Z/iVymgx9uwu1pHOeuw IDTNYbHTm8jt+HAiu/GgZKyJ2Nk2xbI= X-Received: by 2002:a17:90a:6e04:b0:213:22d:b2e2 with SMTP id b4-20020a17090a6e0400b00213022db2e2mr713827pjk.148.1668494163260; Mon, 14 Nov 2022 22:36:03 -0800 (PST) Received: from VirtualBox.. ([129.227.152.6]) by smtp.gmail.com with ESMTPSA id e4-20020a170902d38400b001822121c45asm8767874pld.28.2022.11.14.22.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 22:36:02 -0800 (PST) From: Yuwei Guan X-Google-Original-From: Yuwei Guan To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Yuwei.Guan@zeekrlife.com Subject: [PATCH v2 3/3] f2fs: change type for 'sbi->readdir_ra' Date: Tue, 15 Nov 2022 14:35:37 +0800 Message-Id: <20221115063537.59023-4-Yuwei.Guan@zeekrlife.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115063537.59023-1-Yuwei.Guan@zeekrlife.com> References: <20221115063537.59023-1-Yuwei.Guan@zeekrlife.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749543192565946107?= X-GMAIL-MSGID: =?utf-8?q?1749543192565946107?= Before this patch, the varibale 'readdir_ra' takes effect if it's equal to '1' or not, so we can change type for it from 'int' to 'bool'. Signed-off-by: Yuwei Guan Reviewed-by: Chao Yu --- fs/f2fs/dir.c | 2 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/super.c | 2 +- fs/f2fs/sysfs.c | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 21960a899b6a..eecbf5d6b002 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -1000,7 +1000,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, struct fscrypt_str de_name = FSTR_INIT(NULL, 0); struct f2fs_sb_info *sbi = F2FS_I_SB(d->inode); struct blk_plug plug; - bool readdir_ra = sbi->readdir_ra == 1; + bool readdir_ra = sbi->readdir_ra; bool found_valid_dirent = false; int err = 0; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e6355a5683b7..384840216e7f 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1693,7 +1693,7 @@ struct f2fs_sb_info { unsigned int total_node_count; /* total node block count */ unsigned int total_valid_node_count; /* valid node block count */ int dir_level; /* directory level */ - int readdir_ra; /* readahead inode in readdir */ + bool readdir_ra; /* readahead inode in readdir */ u64 max_io_bytes; /* max io bytes to merge IOs */ block_t user_block_count; /* # of user blocks */ diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 3e974c003b77..0d1adfdd0603 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -4068,7 +4068,7 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi) 1 << F2FS_IPU_HONOR_OPU_WRITE; } - sbi->readdir_ra = 1; + sbi->readdir_ra = true; } static int f2fs_fill_super(struct super_block *sb, void *data, int silent) diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index df27afd71ef4..53fbbb87dd0f 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -649,6 +649,11 @@ static ssize_t __sbi_store(struct f2fs_attr *a, return count; } + if (!strcmp(a->attr.name, "readdir_ra")) { + sbi->readdir_ra = !!t; + return count; + } + *ui = (unsigned int)t; return count;