From patchwork Thu Feb 2 09:41:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5p2O5oms6Z+s?= X-Patchwork-Id: 51828 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2388:b0:96:219d:e725 with SMTP id i8csp192903dyf; Thu, 2 Feb 2023 01:43:15 -0800 (PST) X-Google-Smtp-Source: AK7set/KHxwv4XHHNHP0v5s2a5kap6+09FA84LTBaHh+vkHd9ePwF0OO28EjB7MJi3pXQlaDDZ3L X-Received: by 2002:a17:90b:380a:b0:22c:18a:60b0 with SMTP id mq10-20020a17090b380a00b0022c018a60b0mr5883007pjb.26.1675330995110; Thu, 02 Feb 2023 01:43:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1675330995; cv=pass; d=google.com; s=arc-20160816; b=ByMy2aEj9tgS94pIgz6KH4jpiQsrmBjTC4WlfbgaN74O2+a6YZJDMU2H7HPPQaO+aX N3S1abfvjk85lWV6cjnbnsZrjlgktK7HwLsbelv12WXJrjPJCiWqk+9uV7bvffTeQ/+j HuaXxDrOTJ0jORt1csTjhKsed4cjrE4mSRh6ngotT235hdQdPpnJbo5ayF638vm88Ilx L4y8Tmpbn9r+DB+7bMSkz+gH120oPhSF/KHohcRCKf+/JbzMe84fYICT9RAvC1lzh8ba TwPZM6Lw8zvP0DRgR6zkSqebhtw30Bc4VDuJFA1/DQOBcg58JEZVgX9lazQ1U074obzf GOMw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=d6ey7vAAt2izQwAOGBj5q+b3OAqGK6rdZflWN1o2NPQ=; b=I0wjhfMVGyAQhq/Sjwrv1gMiG0J1aO+Ck6of/GDsSqsgN6gQry2OXRd8pcvQcTL0Vv kfJvpqOO/eETI1qsDF3mnmV+rbIawffB56bGgo157FWpEWc67KJGDe/gsP1daIcYnQmd M/6VD2inVFX9U6mAGAyhxU5RGFycV1vy5sCg3opSJACNMVZ6gfZvqZAoVVyaGPlP8/nc k/h7WG7DPA4817uNnxhGH2aDZT0u3vQuQE4QbQbiu+x/UPsuFnj9J/K8yrpcZgxVRRnz KoZ/f9FM+1hLYBMjls9g7lwkGEzdXqsf56brA10N9EYvHRD2QaWuAy0mBP6Lo8DNLJBe phkQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b="UdgCOSI/"; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s72-20020a63774b000000b004df0d68adf2si21573460pgc.629.2023.02.02.01.43.02; Thu, 02 Feb 2023 01:43:15 -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=@vivo.com header.s=selector2 header.b="UdgCOSI/"; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232295AbjBBJlq (ORCPT + 99 others); Thu, 2 Feb 2023 04:41:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232014AbjBBJln (ORCPT ); Thu, 2 Feb 2023 04:41:43 -0500 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2109.outbound.protection.outlook.com [40.107.255.109]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A73D83262 for ; Thu, 2 Feb 2023 01:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PEElaf3lY/RUOe5vKLzxuqGTJQktpAMJZ8tgGyGIktPs+kTn9VlSO18PMqlXFL/71EDzMA7kfjoT5dyIS0YsIb0YB2jRLfQwgu8Y4ejjmqOLaTWrq01u4VLx8mxlv8bGXr4Z2GOQeHEW5T0NmbhxYwcXZvLTvSOdZcAwhdYKJncV7JriyFlMtYnfmZZAaB/il2GVfAQ7GQQbi/samFtOS4kGq1Ipi7cAfd9zqAGNJoWtd/b84MUGDf1wGIC05cAHqNLIkOKiaV8OiLwSfnUG5KxuAP1VSLigF0dTDKkaPwpTitKlYTlFEneKCRC2R4cN2RlEFzoNs1rl1ZaXZ5AQ7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=d6ey7vAAt2izQwAOGBj5q+b3OAqGK6rdZflWN1o2NPQ=; b=MMDOmiGmHMa/hbbENpizCB3oT8/ZKOQj/T4hjx973DEzYqSx1ufkWvWqLmW/+E7eCmF3ru69KZeRhCzenIMzQpclPZisMoulNVXHKy4OCtnAGboAcpI29YfCcUrAgIB/zQey1/CVwjq8w65HHGY4JpzCEVD4fM3ttotKVKAMCehmCd68DN+Q+31SyQX5bOjkR+iQ5ZSsnbGLAtMWAMFw12X1MYDCBMXMcleZoa7jonH9yv4sWUwu07AvfjoulS4HE+tCP/agLYrsQQo8vMvAPaI4yMb6v7m5kTBXWWqkCHQDKv/LWsHYQ1Qj+mDmIEjlURJARR9R1zaDT31G4L+tDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d6ey7vAAt2izQwAOGBj5q+b3OAqGK6rdZflWN1o2NPQ=; b=UdgCOSI/xuKi+TrwBHFiKwrw3CDWteK2fdTVRMS+1Q5iiQKgQVYbIXGAym1Tw3fDlX88FcLBvz4PyhDWyXo7rHXenpNH34jam+pL2OPJrPJCn1HhsMRLLKyArmFbNIkmHa54U2fvXTgabGUuzcr6eyaMHBvmXKNkof8IZE+P163Hu7d8waArLeVHWxIwUdZZQk9UZwRFApy5xHm1SkUfyubOyfaIct9cYebDMsIqOWhb0w3scX6x5FWMoFBR7d2bnZEqAfeOXQPTVrxuJX6nvjUREpt4G4W1Pyqs41+nJEyy9pKXQ/ijgT7+UMNt+ib7qW77EJUlQ9o0VxwSgCG8bw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by SI2PR06MB3914.apcprd06.prod.outlook.com (2603:1096:4:f8::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.6; Thu, 2 Feb 2023 09:41:36 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::3e52:d08c:ecf4:d572]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::3e52:d08c:ecf4:d572%5]) with mapi id 15.20.6064.022; Thu, 2 Feb 2023 09:41:36 +0000 From: Yangtao Li To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Yangtao Li Subject: [PATCH] f2fs: fix f2fs_show_options to show nogc_merge mount option Date: Thu, 2 Feb 2023 17:41:23 +0800 Message-Id: <20230202094123.74342-1-frank.li@vivo.com> X-Mailer: git-send-email 2.35.1 X-ClientProxiedBy: SI2PR02CA0020.apcprd02.prod.outlook.com (2603:1096:4:195::7) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SI2PR06MB3914:EE_ X-MS-Office365-Filtering-Correlation-Id: fd24b0b3-d606-4efe-4daf-08db0501ad31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wK7R86B++jA7rn0z9MGp3xX9PXipJTHAKxDCNrXuQdCjzi0YPpzv3RHdLD5p6pofck7msTmfi8JeUfoA6RYT7JUx/n6pn0hiEtGO8IdwB+tuW061KkDIOphRy6F62l9DLlYyalIJY0FwSiBttXx1xbeFJSfnE7YK/8iz2SD9XROmq5hFn7ws0kp//yIdTV4t9bi6Q2lQvYy5S0CJxbjmL3TLB21EUq1drCv2pM1f+5CES50dbQq+10Z5mmFB4nOK8Y7apilL93wl6wjVei3aLtMZnUfNQNvHTFFv3r3mkE7xX6YtfYBvJgnGHJROvb326WB24mCmAp3v1g7vbUF6gqVwYREQk/jphZRZ8ObD/v4TCjTBsZ3dgObVJovISTNISz8vpeQiK9sV11Dzp4MesLWYuclGw68qUbV2aTMVMF3TFy6BQRioKOeJcHgbmDFAKj/V0VYx5TeFIlVe2lfBaf8lye+mp6nwNfs9CBKFgr4wZRh5FkbMFSR9u8NyhO7Fj/hL2sVKI9G1rM0IqDXLugQvXLXVUhM3bXO1I43YIztO1OB8nSENg4BNDcSPECa7MmS5h/lcUjhIqTfa6cC43k681ryHqeA/xX66/H9Fzw1NvM0Qhjqqcf6e6rTLSrr1PZg1aml9p7Xiotkot7+xplryqTP43Hn3ENzYfR+GrcRjlVe2H+S3Em320xEoarkFYqSNg2WRg2P6ZC3yNN9nbw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(346002)(376002)(39860400002)(136003)(366004)(396003)(451199018)(38100700002)(38350700002)(5660300002)(316002)(2616005)(86362001)(36756003)(186003)(6512007)(2906002)(26005)(52116002)(6486002)(6666004)(478600001)(107886003)(66556008)(66476007)(4744005)(4326008)(66946007)(6506007)(1076003)(8936002)(41300700001)(8676002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: D/ftA8Cl1iE9vq16Fac2xg9EeCc6rNpJFjorX5hf8RGDTtPI8zgQ/XlFAieNBqY5yUGXnTmQFX/Fl42N9yFTV/3CDTz6AZrSB6kVLmBP0NYuVLvPhF7iK8IPS8QvKjRLW21h2wS1ztSsO6DZQuRjQni7ijZ9x39V6iXNqEiAjOpYhP3b4wRko1PTCXM1yrZNcXhwN5snEtPJfIlf3hsc3pbgH1Cx7L2dxnDqOD1o6rK9e6EWLyCkdDPEoGejTbbMOA9pUEG08uiVvo3s4QHckUm6LlTy2iPB2mS3Y1QiuVqPmvlAezOVAL7dI58MaJa6a+j3JYvcD/38nqYG/iBdQp0ciCIBAZ8VkuQzUIDZYH9v6voRRi6wPy8U1FwqQPc0lqDQFUmry3pa53GaFxNHAfO5yPhJBIZQWbECJJpHDiKIL60VzaVT6ne3YSge6xLtf0aqBQEI0Ysro4yVA8mzfVLFsnBX3lI8GJ+FaIUkt11B2yImg3y3GZbhG46ThLl+xRDweSwOB9emCA7+XfcgM36Kvg0lg3WGHLEFWBvZj38z29Uq5LUk6eO9ibjq0q0WOFQ8bqYIusc29ybchZ24XlzhT1tDIikF1QGdMjwO4ydywy2MGSqE87gg1cNZgeu6IE597YfvCk25QfR6kuBShLUCy9NQWkhXPGD8RFosv98iit7j2tDbsnWaIILLoKGXD1BhVtwKwD/yKaAeoGyWt6mO+GTb2PyZkGb5fuSxPgbs6osV7IMDz1xoKfX7Rlnq1wZolWS6wJQGMV/47vtK2nid4F5FHrfed+kNpM/ULPAGfRDTLFPmR1i46BnaS4pvZ6LXhmbL9ReZUx/c1a5eVdl2NTGyAgSrH1nnYGwkgYqEiyXxsT0JeK1AU0doaiExvHDqtnb3BcR5euISe9FRSUaDI9efw15eavF7dOSOOETc6VpiTt+Th8FsaXsNKDMzuS3ee04+zfO2FSoP9vDHA1X6BlT8UvYYrg5NrIj9cV3gPV6KV1aNBIfHuGyKYWS5yxkNIXp5i3FN8fp8px4/evH/dZ8tzxsfOhAnw/J9bWBvVz5e9JgV05rX8IafrMTejcuAciceg/G5bifpoATO7ock29Hg5i9Qj84icqXVC8mvwZXkEBUss+YpLFG8V2sQheT0Tmo5Fzn1uWkVLrDmlQdmY1vMdO0vvwZsuY3U3Osg4uAA9CP9cDPhl/44A6NmCaxpdg4vYKQG4UA5IGmWBjL5DXNVy8urtyt3KZBK1joLamkevqkTTthdFd45GOgupD4kTP043BBb6pearajimTNEodVFCiOItJSM+xQFFcPyFYhxgADwdXy5L4mfJoR0OrooW5mShbFYCwvxqvETEspp0YntP1XZ6jeOLUx+GNdyxtf7taISTDAkvNGCdSmFm8/rQnlfI2ITaUc7GhiI1zeWQuC7zUBNw/Da1zoZR4qUluAfKM6tW6zoOeqv4oF4KCkv8P3owmTBta0gk0jBtzXdqYSfhYoexoXgqA8vxlB5rCNlGQwJ2KH6QyN1AMomUBoguP4mCyUjDQ8DmK6UvnvozX2hvnyx4Tcjj4CiZCH74EKsuyfJgVWsDsE8i1MV X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd24b0b3-d606-4efe-4daf-08db0501ad31 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2023 09:41:36.4039 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VxM6B2m2XwS9TKeC4koMrsj3mTEq5NG67Kjcfz7Yt7ascz4id3T/IOJwYmL4AYX969s3Ds6pEbRqMN6pSQDomg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB3914 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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?1756711873486602210?= X-GMAIL-MSGID: =?utf-8?q?1756711873486602210?= Commit 5911d2d1d1a3 ("f2fs: introduce gc_merge mount option") forgot to show nogc_merge option, let's fix it. Signed-off-by: Yangtao Li --- fs/f2fs/super.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index fddff5deaed2..4ec2cbbc47eb 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1902,6 +1902,8 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root) if (test_opt(sbi, GC_MERGE)) seq_puts(seq, ",gc_merge"); + else + seq_puts(seq, ",nogc_merge"); if (test_opt(sbi, DISABLE_ROLL_FORWARD)) seq_puts(seq, ",disable_roll_forward");