From patchwork Tue Oct 25 08:05:26 2022 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: 10583 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp875363wru; Tue, 25 Oct 2022 01:21:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4wjbLemWqgEzLtfu9mqKr52UiXWcoZ5XZ1xOEMedYDcGcVsc1t/FAJLFI2ucrIaCEq/vLp X-Received: by 2002:aa7:d357:0:b0:45b:dab5:9789 with SMTP id m23-20020aa7d357000000b0045bdab59789mr35423388edr.222.1666686065350; Tue, 25 Oct 2022 01:21:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1666686065; cv=pass; d=google.com; s=arc-20160816; b=g33Kb0GZUS2xU/62pNgCSK2E21ZP/hdIz2PQHPsTR8fmgMiCBpvq9jQF4f80rtoKdl yUT7wB+QPvviNzrqNPAm1DCMt6WtsAaREd5TsSc4PgaqHE8K2GF8r/HifEujkFRPHv+T eiZuUmrJBkVW333MaZZqkm5C4HPl7OohDyRwBhJs7wZtlokbs6+aHOL4XI/VJq7T3Euw r1Cg+6wp7sLJBJlPkoo93/EfAfOqgahxWh2iyhDmX/MpHUIyXzq+MAWmbVAeDmrD/jUK vSkHR0VaRg/tvxTjFeUt+xs+YbHc7OEvji81BD1b2XqrltFXd4+J1yOy4uva8hO1mqI7 ypfg== 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=Q6mhdRo0rJ0G+OYhur+vjiwq9R07TyurOMjhIaGh4Zw=; b=v+v2001YH16XdhlR0AkbHr7lcUJTIi7MqaS115D1QYbUx4sea+4dtGY4RTx43AhgV6 mKv1YvdI8HGfmQDbnD0QOrbf8JmfeDi0KB/aBycNKO08Qn6CkpCPofXpuNIWZnqT5bni nIXP9o6lwA1ItS1Bixs+NCquwyiSTJwnAbOJ4+E+NAakvhtTsw1TrBGM5o4wwvxCReri M+vtR24vReusuX2alFR0HQxlVIwI4C+FwmFHDTKjhm2MEU4qNo0AR0tOSYCjsGZCpfQI ru1YQGbxVYLnfIADLPThbyKo4G3g4c5tLfxstLoOlCrUjii4n2JijKtRK/cN3Gf+1jC3 5ndA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=ZYuYi+Fn; 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 ne31-20020a1709077b9f00b007abafe45a93si2078932ejc.701.2022.10.25.01.20.41; Tue, 25 Oct 2022 01:21:05 -0700 (PDT) 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=ZYuYi+Fn; 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 S231743AbiJYIFo (ORCPT + 99 others); Tue, 25 Oct 2022 04:05:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231752AbiJYIFj (ORCPT ); Tue, 25 Oct 2022 04:05:39 -0400 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2122.outbound.protection.outlook.com [40.107.255.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BB815FAE5 for ; Tue, 25 Oct 2022 01:05:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fnlB77EC8slHXFmQWbSNZ9uLSdwxfJNxskxNdM2nV6/Qad2MtL8RCh8aAoWqEvoKmMsuFHu8imQYJDT+fFnCSA0HQKM44TvGJ2wuj6sDd4CgOhR7G+dT4ciZwfYP20L9uyDAX9noGydvbM/EwKrYsXBaQFcxMeiLXnTnLQ5VklIlGDkyEVjHDlX0cqW2l7t/r3MlynkHc/wakbh3nbTu4aVyLSStqDhZy8//lB3IyOioEGgZ32uYgkL/9vsznTvPFhYPn+3XgNdNfHgtUNPjzRrvtwy/GsGtmjIUPztWlPtyRGsMgNUuNHjh7ta0+f+3cI1RVdGsK10KJJYgC9WJ3Q== 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=Q6mhdRo0rJ0G+OYhur+vjiwq9R07TyurOMjhIaGh4Zw=; b=apzOLIC4oerAOB5MGj6j/IThMVHqf8WgzWsH0FT1vkkkMcaP5NHR8w5R1/nkymqid+dZsJuwGkeVFf/lRue/DMBselX5cThIIM/UTnctvFPv3ESQTemrMbjx/9X/hpnj8FiR/QwxKbFPVwJdgjYdSJbt8aXAItwehlc7OPbV3aiaciUiVnSYj0die6uD8cPE2SekGDgiAjj6t61BUg83q7oNdZqvjPwQTwudA7MIp1Q/rr+NzjSmDOdxXvilJ8X+PMCoqBGshtFRkzH1O9ISTJ5l7NkDxss8inBXfY5Dw0YlKAfxbbKuqBiOmaAmyBe90W9oYprqkUYUajZ3/fYlMA== 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=Q6mhdRo0rJ0G+OYhur+vjiwq9R07TyurOMjhIaGh4Zw=; b=ZYuYi+FnZwB9eiDfcbGTqpA9SRYjrVJPrRS9YVcGWZGmEncKeOU0u+TPTo0d6p/9BibCvKiNVG4b5zi3GvpJ2G4mWAg0hyFuomgz8v7NuRURmhXFz6E0UrMm+crZPo6sT12SEKofsnhyP9/o+Qcat6M1psmJ42173VI4BsLqUpPNaU5kqqjUUp4Iw9IP6FkELu0hV+8aj636DEeAWiT5uXid8ohFKju/FQBp6xLd/YetKNokErehPqdlCJMHhwX5JKbZn654O5cibUH1fnO3/0XkfbbdKuJxvS2ZoAAccBmJGEXqgUdNRYZGE3fzMIkGczzZ29k9ke1bpe/ORpwFXA== 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 KL1PR0601MB5550.apcprd06.prod.outlook.com (2603:1096:820:c1::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Tue, 25 Oct 2022 08:05:35 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::c84b:5a6c:d66f:c0fd]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::c84b:5a6c:d66f:c0fd%3]) with mapi id 15.20.5746.023; Tue, 25 Oct 2022 08:05:35 +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 v3] f2fs: cleanup in f2fs_create_flush_cmd_control() Date: Tue, 25 Oct 2022 16:05:26 +0800 Message-Id: <20221025080526.9331-1-frank.li@vivo.com> X-Mailer: git-send-email 2.35.1 X-ClientProxiedBy: SG2PR02CA0010.apcprd02.prod.outlook.com (2603:1096:3:17::22) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|KL1PR0601MB5550:EE_ X-MS-Office365-Filtering-Correlation-Id: ec435f05-32b2-4dc0-1598-08dab65fb247 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HthUCvfyYySU40wTUl55b6cfhYXZ2Ea2pnKovp0va2oyb95mAl0J9IE9kj9i/eO3ZdycqeNiJ5k8hOu0g+bkB6zc4twBqq91NxYMd3eiDOhfwhO4okXGGC2gOnFCX/WPNFzUo/DAVp3wuYDe94YOpiUSXTkOuMaB+umtR00cmSZYrEftKAoXnThgropveHkbMUUHxdfB5Lx5FKNqCKRzH+4RKggA/anjZCL7n281qCWMu8A+eJ7FTmDDIuTsJxRYll4EmNSlrY+Hhqvam0kb8rkHlbXBx4c09YoxXJaO7rqGQ9hYxqIsQWE1OY7/t7klRXcM7k4kWC3BI3jV4dCq4G7jbnhVy4BGdJYW8JXE0anml3mpXIG5HQzy0cfY9++Ha+/iYpLw23BzmaceZWlrly2X3hvgCyWD2DUjPpfI6FcpLKoSC7doMCQ17MFi9XLkd4uVp4x7ZyuItz3MRjQlc0i8j1l6rhyHn/jWmARVkZiy1oLSYPLn11RgOgdv2raEkjHgyFxjcOhDuNalR2ssWx2+re0CgIC0T+JGHLladbp4uCBsdeq0cKoz85yokd4c41S1Pwos4nbOhkphZAUy3mofR1P43YUsFEwMZhMF24e/+fYTt+Z0LQrdUBPDqARr0/C6hfn/+LDQQgB+buMQF7uW0Z7Cl/53LmFnW6Z8irrLA2QKrSftIiZl8wxTliAiPX+07NnoseLPhJHG/Bo116JKf7SryRudbXm9P9h5cHscSKdJn8rl/sx0iuYGoVlxoiCqK1Nx7TFMEXU88N1HjA== 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:(13230022)(4636009)(376002)(396003)(136003)(366004)(346002)(39860400002)(451199015)(2616005)(1076003)(186003)(86362001)(38100700002)(38350700002)(41300700001)(83380400001)(316002)(2906002)(8936002)(5660300002)(478600001)(6512007)(26005)(6486002)(107886003)(6666004)(6506007)(4326008)(52116002)(66946007)(8676002)(66476007)(66556008)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 99ccrjmAuTZ3lfwRQqbSkOxQdjgeQxLS1cB1hiM9rOdprUG+gTvL+whjSBVJaMS9Mb1vNspzCfZOolqvIXFInKb1SURLcS5ElpCbUgLD3zbkmMVlW5Safdfwxecjv2Q9nwPLljnNtI/ClRcZv/Ccdy58LsdOfoL4n+5fiO2eynlDcEDtu0a2KI2JLomA/3GOvVwpljiccKUmZr4VIqydoxHJQA/CGX1orHTUgMrnQCX4F1GOvpLekLYrQT3v8Bxl4WXklDiX114ZAnSy9qvJesEDa5brartF2HvAcl6FIuQrU41LfvI2+6aVLG3ve69AGXITipo5nbLrwq9lrilz68J/HX0VnC1GBfgllZXzQA9aYTggr5cQgNROMWE+2hAT4Ujruf6JeqQQfK/OQ/OE/8pSeO3Ng8yQqaEesxfn3zEzuWeA9BFymGoCsg4TiTq61ATl4WE7uXw+qwdAB9HqBHAqpuUn0C7vaALtja6daiXoeUWeV1A1NfP0IyRZEYWCDJ/GA7xDx3KcgsgsL6/gHejtsX6p3mOsIhAlgSsGXYEOgFWI95nk1xdNZBT5jvdwpRRyzjn2jU9n/NEBIt2VvZXh8tcO1EryoMVZ3IWW2/UgYDZK/S8jwpV3simkTDubK0C63m6qhw30PvNhNFgQ9zJNzgSV4iEhpTSVuZ25tvm15m9/N+egZ4T1zRdcVW4M8yBmR8vvWZ0a8wjJFJHRNA3IhYuNPULvbW7THD48pPPKXvNbapztwLwHAJQXcGeTRf215s+U/xieDmP8tnOT6SZGBSwaIs2GkUZpgjkPff0d+9CZiJZLuhyZgI/YEtVCf2CT4qQmHcwPUvEooBknfy84yjsvyomkUuHvQ1jZA+/FlTpSDBq9eZrHMRu9xuGxutGhlWpaJIb1VGeXoRK2RWfon+v5HBhX+mGTcsN+qLTJMWwvLXmIudlih9YoloykvNMNzdpufKjqA7kyrI7edolYm5Pqt3vjyBzoA+u1Egpp/H9U/xW3PYoRFzKyZjhW9MVqpYjOBCBsJt/lEsV6TvBsfgMGsox9ec7U/M4FIs0Xiy5ny5xzfD2p6I+f/BXCdziC9udrI5A8FLgv2j0UlLQ83m3nvAiUrSu5Qygcq1J8X5GcmOKsUQs7uXo+u+spp10LxLwpyvTvF4HMf56mrRTJRAr4RiAhyw+Fy+YktCXVkPL+bThR7b/BADVghNP4oko+YFMiY5qHyIWoImFJdWyhzFet6ZfVbWKG98439bKaNar7GFNFR7HtRZbHUIzAEgG5pxU9cbadYwVjTCW9PzXbUM/vrBJtg5+uFej+/wg7WBU5acaSqxjbeDWsGJ66u54HUbdxmNWcNcHeShLX/9CwDJbLOkmJgq1myndRXGQk5Avyy5TwY35g6i8TE861ZjaPpNUf13olz96WnC7VGbPavBMg/AUIfavKwWw8pZbUaU2HZvwWdmNkqF0mPBC19CmuAqFfKdErdhEdqrVhZ3YCVAFz0FO5/faXmubRkq2GyeI2/zEvc89a83YndNRq7ZSm1tRUPrEUaMoFbSDxNZDU1RMbX3Be6EOdAKRrXqH80mxvqYRdZ4Docc8zcmvb X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec435f05-32b2-4dc0-1598-08dab65fb247 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 08:05:35.7527 (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: LbrvOXE5PoGtJsojsxZ92H3gaAU2SghaOrWEBf/AKtRKlr43EBLFQLOyppl2a38jQzto3k7t0EeXJOWamohIEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB5550 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,URIBL_BLOCKED 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?1747647007939804038?= X-GMAIL-MSGID: =?utf-8?q?1747647007939804038?= Just cleanup for readable, no functional changes. Suggested-by: Chao Yu Signed-off-by: Yangtao Li Reviewed-by: Chao Yu --- v3: -avoid UAF fs/f2fs/segment.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index acf3d3fa4363..84a17607dfee 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -620,12 +620,12 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi) { dev_t dev = sbi->sb->s_bdev->bd_dev; struct flush_cmd_control *fcc; - int err = 0; + int err; if (SM_I(sbi)->fcc_info) { fcc = SM_I(sbi)->fcc_info; if (fcc->f2fs_issue_flush) - return err; + return 0; goto init_thread; } @@ -638,7 +638,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi) init_llist_head(&fcc->issue_list); SM_I(sbi)->fcc_info = fcc; if (!test_opt(sbi, FLUSH_MERGE)) - return err; + return 0; init_thread: fcc->f2fs_issue_flush = kthread_run(issue_flush_thread, sbi, @@ -650,7 +650,7 @@ int f2fs_create_flush_cmd_control(struct f2fs_sb_info *sbi) return err; } - return err; + return 0; } void f2fs_destroy_flush_cmd_control(struct f2fs_sb_info *sbi, bool free)