From patchwork Tue Jan 24 15:33:46 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: 47751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2238488wrn; Tue, 24 Jan 2023 08:11:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXvYJDEvCOGKiqQfh19d4R0Tjynu/VTKRrG/FLqtGOSaDgnGwy122YxnqdEGpLrp05xzsolK X-Received: by 2002:a17:907:9150:b0:84d:150d:5006 with SMTP id l16-20020a170907915000b0084d150d5006mr27514471ejs.49.1674576698905; Tue, 24 Jan 2023 08:11:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1674576698; cv=pass; d=google.com; s=arc-20160816; b=Tl9F6bgyWDjvA1d5kxlhR8/QlZ8x2aPiCqx5NuKT17ARcyEV8NqwuAEYTsemf3Euve 4yQgMgrPaovdD7v91ZXV6o9j+zKgjKwlrt6oSG99ZOhTk4rNxteoqQ2vm5zrj79PfYWo zn6gdIK6PIP/lW52hAGFN2e796BGDjSZCEATXzX0E56AdFgjFyQDkm+ZbOfskLWQGJdo ZUYI+deRhXsweAzN6lvzhzTbB8GGBplRPERd6IkeY/Cl0JjVVD1QI5xA2qWLG58w9OrI c06AoocgEyihPTiUAea815n+4FLYr2fZOipaOF2CZxbiQgJ5yi5W0Bi4Bww+iJZqalAY 8zzQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jzrS/YczNlxfMf68w7RKv4T5CF4rfwv+fxYfN0w/LE8=; b=onvhLNECVwtxLpIy+J/zJVivwUS8wNhMnicBa6+nIu8ApJns1YLv7KRtrN46ujTeOj Ne8+arGUZsnD8qL0KlDerbTQfIgyoMO880/zHaUv6LKeMuWdu2PQ6YqSPTzHJ7WVL6AT Camr9tnGbOFmWGLxYu7t8N6QrutOu6FrS4M3RX1SOUmkY/jM1a6tUZ4ybulZf18vYB7g duHx/WFQj3ujOmS8W80oS3KfXJljlH9NMQunTsTJkAO0Je0asNNluB2sKzEpPly37zWR YAefxLPUVgcP1koTv0Ka9P5vb0TqprK39bZ4bpc6LpThk2CYARi7LCou82YzUFLOahxP rzfg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=W0k2j9sU; 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 29-20020a170906101d00b007c158ddfba4si3056652ejm.295.2023.01.24.08.11.14; Tue, 24 Jan 2023 08:11:38 -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=W0k2j9sU; 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 S235229AbjAXPeM (ORCPT + 99 others); Tue, 24 Jan 2023 10:34:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235219AbjAXPeH (ORCPT ); Tue, 24 Jan 2023 10:34:07 -0500 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2123.outbound.protection.outlook.com [40.107.215.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EE753BD8F for ; Tue, 24 Jan 2023 07:34:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kmtJgMuD39mGpHp9Lcwl0jh4j5IIOgc+5dmbVs/HpG+CiVh/8ts+i8yK/sFV/Au6YL4EtBAX6xf5Z5Dgt4XFQ5/VMt0QTSV1POsAh2taq0Qc3n6aUExB5lXsLlY7U+uX2KSmBs+rg3q7ScyAecWjU1vyl58xJNUuaxQT/X6WuK3U0v1mffsc4YLvxc2Vou2kKbazs2FxVHHbBamwwTbenEFdZZy0R5+KVPIAsBktTEsLR+M5OGL4E+Hg5Tf2qXRl1imb4C40moqoDfhyzHW+fZshFlUL879vwEg+Q8GqOE1UxqE2hmY2qWVD3R2/ho8e44h2NhhDfHKzNfGcD6negQ== 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=jzrS/YczNlxfMf68w7RKv4T5CF4rfwv+fxYfN0w/LE8=; b=RmBWis4qB+Y5blzoDStdG+X90H10V0iFXoP51u65KbZr8NlNF7m0KXWJgFAlha1CbVvVvgDEl6va3ubeqyzRmd3GkBh8khf3cjTTZXUIM+wFLysFmhgtsI5sO53Yzsk6wogu+aaxp/WD0xeCDg1oEIOybKMpL3R/Tk182ctMll+Jik9AtSfc334nUjRhKjrN3WPpCNy2d2zp9OmeCHIFCh/KyuvVZKgzxkvawKoGpDQTKtNFhyo4mD8IUfew9bNlLtD3wj4w3l25PbawVYNPGIVwhbzWM0sy+JCpvAUk1VhonaTpdcmD1+F4zMdmBaoixnyNzgXatAONS+MF0kZipg== 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=jzrS/YczNlxfMf68w7RKv4T5CF4rfwv+fxYfN0w/LE8=; b=W0k2j9sUqv3mbkOtn18CBlBE2flyXCRTXm3gRib0hZrnygteYWGWCwMgTHLc2BlBbHZXbNkJ/X0NpEZHcc/YAGozGblLTWblBui4cUzHI08wgswGKrezGqHeXC2l2ENxclCpWq1hwZJJJjTRHOXxDeIbSFvLggfHHe5e2Yksd3RDyZEdCAnMs27jtZXmicGn4c9JhAyWnZt+CNC7xySungXQcIRcN4t6W1ElnppMh4hzcnazkiBWzxVqjLY1LweBox2f0iiZxZNwEPpoQqyf1UZgmRxemlmllGnArr0TjML27jLtG7btmzyfW61ZGyy65eZRKEgx9tthr3rJSihHIQ== 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 SI2PR06MB5019.apcprd06.prod.outlook.com (2603:1096:4:1a3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.9; Tue, 24 Jan 2023 15:34:03 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::3e52:d08c:ecf4:d572]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::3e52:d08c:ecf4:d572%4]) with mapi id 15.20.6043.016; Tue, 24 Jan 2023 15:34:03 +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 4/4] f2fs: merge lz4hc_compress_pages() to lz4_compress_pages() Date: Tue, 24 Jan 2023 23:33:46 +0800 Message-Id: <20230124153346.74881-4-frank.li@vivo.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230124153346.74881-1-frank.li@vivo.com> References: <20230124153346.74881-1-frank.li@vivo.com> X-ClientProxiedBy: SGXP274CA0004.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::16) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SI2PR06MB5019:EE_ X-MS-Office365-Filtering-Correlation-Id: d238ad98-16e5-4600-98fc-08dafe206be5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dbr635F61kSQcG6zkrLF8XVB4zWsAwgCbSTQIJnSmmlpZxsmHh/6gqYN6fQR2ZelIfInHpTzawsHmGlFFJdjTbUAVxkRPOKAQGgInmq28KNOAf+mOwD/Y/QEhUXJsSFOmqzVfFEfKG+qhqp7syI4ufSeYjp4HDmVy0B4q/ADS5zVCue3Nzn7b0+eFigmkAO6ec+U5dIRo0yiBwSXvO+8Tfgn46Y6g/POqHSuG1yX/DLgA7uRm4jMiGnY4/My/s5SE1UJQQ9gypkcA/BQqpcYfZinr+ruHyn7NgH1GgAyj7dit9b+cJrw9o9fZmZzfWx5tuqAvB8uAMVp0B71OgG7lJwNAtFwE9t43kK+Le+7ypMyekDgojyg3OqWuhF6s+q3+VFO4oFHwIMIoh5PS5r5iVRXwKkMkUMSHCGi1/Ga/1CFfSH0I0XPkeoJkvTJWdey/DnSgo2yi5sfcihAcpXDzB9pNzTwsvnDVVhsxFw7lBwpyxJnL3w39o9MNIxzeWMMLbw4Cj4i0FCTLCtFp1rKOYqAL96IG+PU2qfX1rsTIc2liC6dfI1Vt5wqZgWN9taxXct3YwiVgcNps9CmZGgSpFfrycGsk7n37MLLC7eX0DF6Z6zWfY2qn/Fi9N/1Y1mWkApu2dZTl11jF80XxuqdgqzQYqTKuqeLTXuB1hjA1ep1DSrHd2npL1lmq8xusOogMBAB5ufnkR/bHMbcxeJJCg== 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)(346002)(366004)(136003)(39860400002)(396003)(451199015)(2616005)(2906002)(6512007)(26005)(86362001)(186003)(38350700002)(38100700002)(36756003)(8936002)(52116002)(316002)(5660300002)(83380400001)(41300700001)(6666004)(107886003)(478600001)(6506007)(6486002)(4326008)(8676002)(66476007)(1076003)(66556008)(66946007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: slyjkFnu6k1g0qCNFTy4TXybn3WAR8FsmvLpFGT5p7ONAb9rdar1CVkU0DxD6ffq77nrFAD9t8gjUPHH8es5SheT2zvWGgE0n0j05pKFQXfrIV0fjWy1VeiMy7t5U3T0vF2r/hl+7kBImTurcGpoSAd4RKNywk7JtOwP5D8jPx/0You2cEctFqcw3s6sZ/gpdpwe28SZcJI4BDHWYa4Fco6ZyfnICmP9S+BVv4v2axBXPthjyjbUOOT2CqoFOvXRYUwewuYzUarbtoCvylbvivJTwpq/j/3obdiagvobj4/J8N/yZ34VUN8tZXxSBo1cNwfgBAZ1JE62h38UpYoe5Vth5BFH/SZ0zRovLLAzk7FjRyMLNZeNgxNdflmHST7Cm1e4kDtYaruHDXDHHYJ4NN3reG030YXujd5SY+j8QAmvOS2NtlfLDIjnEXLt653P2/xGiEDhmP/Zj8MP8GrNf3fs9A9k5oNUsC6dmAPdDGV3bpUF5xvldtY1lEQtXkp9A4QP0cXh6XqKkRp7fgfw1Tg6bEWBWc0U5Dc2PmzFunvwBxPF08XGtBgFFVlYfdWNkM2uKJATOhSpVKcRjGICAX8xL+9n5TPBSblbe/ILVx7NkKjPhGF9Fr45zftA1SbDomzStp6iZAi6Ctag+FuY1JnxQuLYJAIhB7NcgHVsMbqqSH3Fk297pcRRPWiKEHIO9bqVxrjQVgQuVo0mMfHmkvUAck3Io7S1ryJo+OrcK8MhJxHloEl2JI7Hm9t19G040IAa6bX0SkuEQMuEYGt1vrmLKEHkNTEt/zWv0UgKQkzRZrUH6AzhkhE4C5vm21TyOUFEXeMw78Gv1sjwvyTK6MxlXRSxAF+cWOF5fFd4uM1tYiaHSyBQ5DJ4+aCzX6Hoo9xy599KOK6Nb9bkSkP2ilijcFvDjo3o6MniA04y4XnOWK5uXosTX6rCCGuvjIjI7oJUQwJyOzl4hrZWFSOaUizi5zUkAgOQws/Cz3l0X7OZHr6IWkQvE1C6OJzeO/6KBYoCku7Gj1+d6E+77AJ/HLPqcI1RwNFDKY6lC/LL2z+BSIzmCllMZPtA+LIWbaBxd9OYjpqewDHh6CgXx0OFvBTflLNUiFWO/ADlG789eeShVMamRbBpfySIQyrYupw4fhWSN3HSVk5TH1sASmmuJUQCd0j9GOel9Xh+HvkUCYcdfsv17p9lOh5yM8unvitrHdSTgz2O+SPi+jVWnwWYY2JBSJq9d0JIZASQGTbvEEoJwuJ5vqc5Zgo3umDE2M1rCTGQyHjf2BWogXS7XTeTdM236Kh9DaBcFiybaBns22ZgwLrh8eip52Fls9kmFTsvl7aa2p/DrrswjJ8WAJEBWaqV+cyadgLiZaCmho1+H6JukW6i3zBryCCJdonhxOYOk08/nvBSQzgG8Ev0T931zD8Ue8UyxHhHPfrVqoydIrCOXSReWZ9pO/LGa2CzWwMzMPFegWBYpDDbmPOt3ZiEU+DTex9CguALlnBQes1WJYCVunjv5zr625oCcnoK6nIO67RZUV1+gGgL29O84gTHd78g2fDGQndJKNsxBiPODqN6ECvzhYdbZ5CHkYkZ0FUa X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d238ad98-16e5-4600-98fc-08dafe206be5 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 15:34:03.0213 (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: xshbnf4v/T5RL6L317dPFSu1t60QxIhk9pF3T5rhoyHFACoc0qmxmU+025A3IFIRZTPEdEdKA4hE+oRRzocfIA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB5019 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?1755920936644492407?= X-GMAIL-MSGID: =?utf-8?q?1755920936644492407?= Remove unnecessary lz4hc_compress_pages(). Signed-off-by: Yangtao Li --- fs/f2fs/compress.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index b196b881f3bb..112f0e208b4e 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -264,36 +264,21 @@ static void lz4_destroy_compress_ctx(struct compress_ctx *cc) cc->private = NULL; } -#ifdef CONFIG_F2FS_FS_LZ4HC -static int lz4hc_compress_pages(struct compress_ctx *cc) +static int lz4_compress_pages(struct compress_ctx *cc) { + int len; +#ifdef CONFIG_F2FS_FS_LZ4HC unsigned char level = F2FS_I(cc->inode)->i_compress_flag >> COMPRESS_LEVEL_OFFSET; - int len; if (level) len = LZ4_compress_HC(cc->rbuf, cc->cbuf->cdata, cc->rlen, cc->clen, level, cc->private); else +#endif len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen, cc->clen, cc->private); - if (!len) - return -EAGAIN; - - cc->clen = len; - return 0; -} -#endif - -static int lz4_compress_pages(struct compress_ctx *cc) -{ - int len; -#ifdef CONFIG_F2FS_FS_LZ4HC - return lz4hc_compress_pages(cc); -#endif - len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen, - cc->clen, cc->private); if (!len) return -EAGAIN;