From:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
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>
In-Reply-To: <20230124153346.74881-1-frank.li@vivo.com>
References: <20230124153346.74881-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?slyjkFnu6k1g0qCNFTy4TXybn3WAR8FsmvLpFGT5p7ONAb9rdar1CVkU0DxD?=
 =?us-ascii?Q?6ffq77nrFAD9t8gjUPHH8es5SheT2zvWGgE0n0j05pKFQXfrIV0fjWy1VeiM?=
 =?us-ascii?Q?y7t5U3T0vF2r/hl+7kBImTurcGpoSAd4RKNywk7JtOwP5D8jPx/0You2cEct?=
 =?us-ascii?Q?Fqcw3s6sZ/gpdpwe28SZcJI4BDHWYa4Fco6ZyfnICmP9S+BVv4v2axBXPthj?=
 =?us-ascii?Q?yjbUOOT2CqoFOvXRYUwewuYzUarbtoCvylbvivJTwpq/j/3obdiagvobj4/J?=
 =?us-ascii?Q?8N/yZ34VUN8tZXxSBo1cNwfgBAZ1JE62h38UpYoe5Vth5BFH/SZ0zRovLLAz?=
 =?us-ascii?Q?k7FjRyMLNZeNgxNdflmHST7Cm1e4kDtYaruHDXDHHYJ4NN3reG030YXujd5S?=
 =?us-ascii?Q?Y+j8QAmvOS2NtlfLDIjnEXLt653P2/xGiEDhmP/Zj8MP8GrNf3fs9A9k5oNU?=
 =?us-ascii?Q?sC6dmAPdDGV3bpUF5xvldtY1lEQtXkp9A4QP0cXh6XqKkRp7fgfw1Tg6bEWB?=
 =?us-ascii?Q?Wc0U5Dc2PmzFunvwBxPF08XGtBgFFVlYfdWNkM2uKJATOhSpVKcRjGICAX8x?=
 =?us-ascii?Q?L+9n5TPBSblbe/ILVx7NkKjPhGF9Fr45zftA1SbDomzStp6iZAi6Ctag+FuY?=
 =?us-ascii?Q?1JnxQuLYJAIhB7NcgHVsMbqqSH3Fk297pcRRPWiKEHIO9bqVxrjQVgQuVo0m?=
 =?us-ascii?Q?MfHmkvUAck3Io7S1ryJo+OrcK8MhJxHloEl2JI7Hm9t19G040IAa6bX0SkuE?=
 =?us-ascii?Q?QMuEYGt1vrmLKEHkNTEt/zWv0UgKQkzRZrUH6AzhkhE4C5vm21TyOUFEXeMw?=
 =?us-ascii?Q?78Gv1sjwvyTK6MxlXRSxAF+cWOF5fFd4uM1tYiaHSyBQ5DJ4+aCzX6Hoo9xy?=
 =?us-ascii?Q?599KOK6Nb9bkSkP2ilijcFvDjo3o6MniA04y4XnOWK5uXosTX6rCCGuvjIjI?=
 =?us-ascii?Q?7oJUQwJyOzl4hrZWFSOaUizi5zUkAgOQws/Cz3l0X7OZHr6IWkQvE1C6OJze?=
 =?us-ascii?Q?O/6KBYoCku7Gj1+d6E+77AJ/HLPqcI1RwNFDKY6lC/LL2z+BSIzmCllMZPtA?=
 =?us-ascii?Q?+LIWbaBxd9OYjpqewDHh6CgXx0OFvBTflLNUiFWO/ADlG789eeShVMamRbBp?=
 =?us-ascii?Q?fySIQyrYupw4fhWSN3HSVk5TH1sASmmuJUQCd0j9GOel9Xh+HvkUCYcdfsv1?=
 =?us-ascii?Q?7p9lOh5yM8unvitrHdSTgz2O+SPi+jVWnwWYY2JBSJq9d0JIZASQGTbvEEoJ?=
 =?us-ascii?Q?wuJ5vqc5Zgo3umDE2M1rCTGQyHjf2BWogXS7XTeTdM236Kh9DaBcFiybaBns?=
 =?us-ascii?Q?22ZgwLrh8eip52Fls9kmFTsvl7aa2p/DrrswjJ8WAJEBWaqV+cyadgLiZaCm?=
 =?us-ascii?Q?ho1+H6JukW6i3zBryCCJdonhxOYOk08/nvBSQzgG8Ev0T931zD8Ue8UyxHhH?=
 =?us-ascii?Q?PfrVqoydIrCOXSReWZ9pO/LGa2CzWwMzMPFegWBYpDDbmPOt3ZiEU+DTex9C?=
 =?us-ascii?Q?guALlnBQes1WJYCVunjv5zr625oCcnoK6nIO67RZUV1+gGgL29O84gTHd78g?=
 =?us-ascii?Q?2fDGQndJKNsxBiPODqN6ECvzhYdbZ5CHkYkZ0FUa?=
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
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Remove unnecessary lz4hc_compress_pages().

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 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;
 
-- 
2.25.1