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>

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 3182e15062525e8683172ac0938bf9baa1c7e000..11653fa792897df001031e179a52e5c69965fb0d 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -264,35 +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 = -EINVAL;
        unsigned char level = F2FS_I(cc->inode)->i_compress_level;
-       int len;
 
-       if (level)
-               len = LZ4_compress_HC(cc->rbuf, cc->cbuf->cdata, cc->rlen,
-                                       cc->clen, level, cc->private);
-       else
+       if (!level)
                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);
+       else
+               len = LZ4_compress_HC(cc->rbuf, cc->cbuf->cdata, cc->rlen,
+                                       cc->clen, level, cc->private);
 #endif
-       len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen,
-                                               cc->clen, cc->private);
+       if (len < 0)
+               return len;
        if (!len)
                return -EAGAIN;