From: Jan Kara <jack@suse.cz>
To: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>,
linux-ext4@vger.kernel.org, "Theodore Ts'o" <tytso@mit.edu>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ext4: fix bh leak on error paths in ext4_rename() and ext4_cross_rename()
Date: Wed, 4 Mar 2015 16:03:39 +0100 [thread overview]
Message-ID: <20150304150339.GB32219@quack.suse.cz> (raw)
In-Reply-To: <20150303111719.26916.92177.stgit@buzz>
On Tue 03-03-15 14:17:19, Konstantin Khlebnikov wrote:
> Release references to buffer-heads if ext4_journal_start() fails.
Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> Fixes: 5b61de757535 ("ext4: start handle at least possible moment when renaming files")
> ---
> fs/ext4/namei.c | 21 +++++++++++++++------
> 1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index 28fe71a2904c..8110dd20ad3f 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -3264,12 +3264,18 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
> EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2);
> if (!(flags & RENAME_WHITEOUT)) {
> handle = ext4_journal_start(old.dir, EXT4_HT_DIR, credits);
> - if (IS_ERR(handle))
> - return PTR_ERR(handle);
> + if (IS_ERR(handle)) {
> + retval = PTR_ERR(handle);
> + handle = NULL;
> + goto end_rename;
> + }
> } else {
> whiteout = ext4_whiteout_for_rename(&old, credits, &handle);
> - if (IS_ERR(whiteout))
> - return PTR_ERR(whiteout);
> + if (IS_ERR(whiteout)) {
> + retval = PTR_ERR(whiteout);
> + whiteout = NULL;
> + goto end_rename;
> + }
> }
>
> if (IS_DIRSYNC(old.dir) || IS_DIRSYNC(new.dir))
> @@ -3433,8 +3439,11 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
> handle = ext4_journal_start(old.dir, EXT4_HT_DIR,
> (2 * EXT4_DATA_TRANS_BLOCKS(old.dir->i_sb) +
> 2 * EXT4_INDEX_EXTRA_TRANS_BLOCKS + 2));
> - if (IS_ERR(handle))
> - return PTR_ERR(handle);
> + if (IS_ERR(handle)) {
> + retval = PTR_ERR(handle);
> + handle = NULL;
> + goto end_rename;
> + }
>
> if (IS_DIRSYNC(old.dir) || IS_DIRSYNC(new.dir))
> ext4_handle_sync(handle);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
next prev parent reply other threads:[~2015-03-04 15:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 11:17 Konstantin Khlebnikov
2015-03-04 15:03 ` Jan Kara [this message]
2015-04-02 20:36 ` Theodore Ts'o
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=20150304150339.GB32219@quack.suse.cz \
--to=jack@suse.cz \
--cc=adilger.kernel@dilger.ca \
--cc=khlebnikov@yandex-team.ru \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/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®