From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Chao Yu <chao@kernel.org>
Cc: linux-f2fs-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: Re: [f2fs-dev] [PATCH v2] f2fs: merge lz4hc_compress_pages() to lz4_compress_pages()
Date: Wed, 5 Apr 2023 09:13:10 -0700 [thread overview]
Message-ID: <ZC2eFqN+UdhM6Qu9@google.com> (raw)
In-Reply-To: <a6d9887f-1ff0-fd43-85ff-e6fee87bbe84@kernel.org>
On 04/05, Chao Yu wrote:
> On 2023/3/31 0:49, Yangtao Li wrote:
> > +#ifdef CONFIG_F2FS_FS_LZ4HC
> > + unsigned char level = F2FS_I(cc->inode)->i_compress_level;
> > if (level)
> > len = LZ4_compress_HC(cc->rbuf, cc->cbuf->cdata, cc->rlen,
> > cc->clen, level, cc->private);
> > else
>
> [snip]
>
> > #endif
>
> [snip]
>
> > + len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen,
>
> It's weired that whole else xxx; statement is split by #endif.
>
> What about?
>
> unsigned char level = 0;
>
> #if
> ...
> #endif
> if (!level)
> len = LZ4_compress_default()
I modified like this.
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -266,17 +266,19 @@ static void lz4_destroy_compress_ctx(struct compress_ctx *cc)
static int lz4_compress_pages(struct compress_ctx *cc)
{
- int len;
-#ifdef CONFIG_F2FS_FS_LZ4HC
+ int len = -EINVAL;
unsigned char level = F2FS_I(cc->inode)->i_compress_level;
- if (level)
+ if (!level)
+ len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen,
+ cc->clen, cc->private);
+#ifdef CONFIG_F2FS_FS_LZ4HC
+ else
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 < 0)
+ return len;
if (!len)
return -EAGAIN;
>
> Thanks,
>
> > cc->clen, cc->private);
> > if (!len)
> > return -EAGAIN;
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
WARNING: multiple messages have this Message-ID (diff)
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Chao Yu <chao@kernel.org>
Cc: Yangtao Li <frank.li@vivo.com>,
linux-f2fs-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] f2fs: merge lz4hc_compress_pages() to lz4_compress_pages()
Date: Wed, 5 Apr 2023 09:13:10 -0700 [thread overview]
Message-ID: <ZC2eFqN+UdhM6Qu9@google.com> (raw)
In-Reply-To: <a6d9887f-1ff0-fd43-85ff-e6fee87bbe84@kernel.org>
On 04/05, Chao Yu wrote:
> On 2023/3/31 0:49, Yangtao Li wrote:
> > +#ifdef CONFIG_F2FS_FS_LZ4HC
> > + unsigned char level = F2FS_I(cc->inode)->i_compress_level;
> > if (level)
> > len = LZ4_compress_HC(cc->rbuf, cc->cbuf->cdata, cc->rlen,
> > cc->clen, level, cc->private);
> > else
>
> [snip]
>
> > #endif
>
> [snip]
>
> > + len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen,
>
> It's weired that whole else xxx; statement is split by #endif.
>
> What about?
>
> unsigned char level = 0;
>
> #if
> ...
> #endif
> if (!level)
> len = LZ4_compress_default()
I modified like this.
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -266,17 +266,19 @@ static void lz4_destroy_compress_ctx(struct compress_ctx *cc)
static int lz4_compress_pages(struct compress_ctx *cc)
{
- int len;
-#ifdef CONFIG_F2FS_FS_LZ4HC
+ int len = -EINVAL;
unsigned char level = F2FS_I(cc->inode)->i_compress_level;
- if (level)
+ if (!level)
+ len = LZ4_compress_default(cc->rbuf, cc->cbuf->cdata, cc->rlen,
+ cc->clen, cc->private);
+#ifdef CONFIG_F2FS_FS_LZ4HC
+ else
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 < 0)
+ return len;
if (!len)
return -EAGAIN;
>
> Thanks,
>
> > cc->clen, cc->private);
> > if (!len)
> > return -EAGAIN;
next prev parent reply other threads:[~2023-04-05 16:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 16:49 [f2fs-dev] [PATCH v2] f2fs: merge lz4hc_compress_pages() to lz4_compress_pages() Yangtao Li via Linux-f2fs-devel
2023-03-30 16:49 ` Yangtao Li
2023-04-05 2:42 ` [f2fs-dev] " Chao Yu
2023-04-05 2:42 ` Chao Yu
2023-04-05 16:13 ` Jaegeuk Kim [this message]
2023-04-05 16:13 ` Jaegeuk Kim
2023-04-07 1:22 ` [f2fs-dev] " Chao Yu
2023-04-07 1:22 ` Chao Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZC2eFqN+UdhM6Qu9@google.com \
--to=jaegeuk@kernel.org \
--cc=chao@kernel.org \
--cc=frank.li@vivo.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.