From: Chao Yu <yuchao0@huawei.com>
To: <jaegeuk@kernel.org>
Cc: <linux-f2fs-devel@lists.sourceforge.net>,
<linux-kernel@vger.kernel.org>, <chao@kernel.org>,
Chao Yu <yuchao0@huawei.com>
Subject: [PATCH 2/4] f2fs: compress: revert error path fix
Date: Mon, 6 Jan 2020 16:01:42 +0800 [thread overview]
Message-ID: <20200106080144.52363-2-yuchao0@huawei.com> (raw)
In-Reply-To: <20200106080144.52363-1-yuchao0@huawei.com>
Revert incorrect fix in ("TEMP: f2fs: support data compression - fix1")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
fs/f2fs/compress.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index f993b4ce1970..fc4510729654 100644
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -601,7 +601,7 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,
fgp_flag, GFP_NOFS);
if (!page) {
ret = -ENOMEM;
- goto release_pages;
+ goto unlock_pages;
}
if (PageUptodate(page))
@@ -616,13 +616,13 @@ static int prepare_compress_overwrite(struct compress_ctx *cc,
ret = f2fs_read_multi_pages(cc, &bio, cc->cluster_size,
&last_block_in_bio, false);
if (ret)
- goto unlock_pages;
+ goto release_pages;
if (bio)
f2fs_submit_bio(sbi, bio, DATA);
ret = f2fs_init_compress_ctx(cc);
if (ret)
- goto unlock_pages;
+ goto release_pages;
}
for (i = 0; i < cc->cluster_size; i++) {
--
2.18.0.rc1
next prev parent reply other threads:[~2020-01-06 8:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 8:01 [PATCH 1/4] f2fs: compress: fix panic in mkwrite Chao Yu
2020-01-06 8:01 ` Chao Yu [this message]
2020-01-06 19:26 ` [PATCH 2/4] f2fs: compress: revert error path fix Jaegeuk Kim
2020-01-08 9:33 ` Chao Yu
2020-01-06 8:01 ` [PATCH 3/4] f2fs: compress: fix error path in prepare_compress_overwrite() Chao Yu
2020-01-06 19:08 ` Jaegeuk Kim
2020-01-07 1:35 ` Chao Yu
2020-01-08 20:49 ` Jaegeuk Kim
2020-01-06 8:01 ` [PATCH 4/4] f2fs: compress: release compress context in caller of f2fs_read_multi_pages() 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=20200106080144.52363-2-yuchao0@huawei.com \
--to=yuchao0@huawei.com \
--cc=chao@kernel.org \
--cc=jaegeuk@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®