Skip to content

Commit 3094e55

Browse files
bbkzzJaegeuk Kim
authored andcommitted
f2fs: merge lz4hc_compress_pages() to lz4_compress_pages()
Remove unnecessary lz4hc_compress_pages(). Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Chao Yu <chao@kernel.org> [Jaegeuk Kim: clean up] Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 084e15e commit 3094e55

1 file changed

Lines changed: 8 additions & 22 deletions

File tree

fs/f2fs/compress.c

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -264,35 +264,21 @@ static void lz4_destroy_compress_ctx(struct compress_ctx *cc)
264264
cc->private = NULL;
265265
}
266266

267-
#ifdef CONFIG_F2FS_FS_LZ4HC
268-
static int lz4hc_compress_pages(struct compress_ctx *cc)
267+
static int lz4_compress_pages(struct compress_ctx *cc)
269268
{
269+
int len = -EINVAL;
270270
unsigned char level = F2FS_I(cc->inode)->i_compress_level;
271-
int len;
272271

273-
if (level)
274-
len = LZ4_compress_HC(cc->rbuf, cc->cbuf->cdata, cc->rlen,
275-
cc->clen, level, cc->private);
276-
else
272+
if (!level)
277273
len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen,
278274
cc->clen, cc->private);
279-
if (!len)
280-
return -EAGAIN;
281-
282-
cc->clen = len;
283-
return 0;
284-
}
285-
#endif
286-
287-
static int lz4_compress_pages(struct compress_ctx *cc)
288-
{
289-
int len;
290-
291275
#ifdef CONFIG_F2FS_FS_LZ4HC
292-
return lz4hc_compress_pages(cc);
276+
else
277+
len = LZ4_compress_HC(cc->rbuf, cc->cbuf->cdata, cc->rlen,
278+
cc->clen, level, cc->private);
293279
#endif
294-
len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen,
295-
cc->clen, cc->private);
280+
if (len < 0)
281+
return len;
296282
if (!len)
297283
return -EAGAIN;
298284

0 commit comments

Comments
 (0)