From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 2/2] f2fs: put the inode page when error was occurred
Date: Mon, 17 Nov 2014 17:57:54 -0800 [thread overview]
Message-ID: <1416275874-74186-2-git-send-email-jaegeuk@kernel.org> (raw)
In-Reply-To: <1416275874-74186-1-git-send-email-jaegeuk@kernel.org>
We should put the inode page when error was occurred.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/data.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 8f16443..12dd58a 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -963,22 +963,22 @@ repeat:
} else if (page->index == 0) {
err = f2fs_convert_inline_page(&dn, page);
if (err)
- goto unlock_fail;
+ goto put_fail;
} else {
struct page *p = grab_cache_page(inode->i_mapping, 0);
if (!p) {
err = -ENOMEM;
- goto unlock_fail;
+ goto put_fail;
}
err = f2fs_convert_inline_page(&dn, p);
f2fs_put_page(p, 1);
if (err)
- goto unlock_fail;
+ goto put_fail;
}
}
err = f2fs_reserve_block(&dn, index);
if (err)
- goto unlock_fail;
+ goto put_fail;
put_next:
f2fs_put_dnode(&dn);
f2fs_unlock_op(sbi);
@@ -1021,6 +1021,8 @@ out:
clear_cold_data(page);
return 0;
+put_fail:
+ f2fs_put_dnode(&dn);
unlock_fail:
f2fs_unlock_op(sbi);
f2fs_put_page(page, 1);
--
2.1.1
next prev parent reply other threads:[~2014-11-18 1:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 1:57 [PATCH 1/2] f2fs: fix to call put_page at the error handling routine Jaegeuk Kim
2014-11-18 1:57 ` Jaegeuk Kim [this message]
2014-11-18 5:30 ` [f2fs-dev] [PATCH 2/2] f2fs: put the inode page when error was occurred Chao Yu
2014-11-19 22:33 ` Jaegeuk Kim
2014-11-18 5:22 ` [f2fs-dev] [PATCH 1/2] f2fs: fix to call put_page at the error handling routine 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=1416275874-74186-2-git-send-email-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).