From: Jan Kara <jack@suse.cz>
To: Shijie Luo <luoshijie1@huawei.com>
Cc: linux-ext4@vger.kernel.org, tytso@mit.edu, jack@suse.cz
Subject: Re: [PATCH] ext4: fix potential error in ext4_do_update_inode
Date: Fri, 12 Mar 2021 13:50:55 +0100 [thread overview]
Message-ID: <20210312125055.GB31816@quack2.suse.cz> (raw)
In-Reply-To: <20210312065051.36314-1-luoshijie1@huawei.com>
On Fri 12-03-21 01:50:51, Shijie Luo wrote:
> If set_large_file = 1 and errors occur in ext4_handle_dirty_metadata(),
> the error code will be overridden, go to out_brelse to avoid this
> situation.
>
> Signed-off-by: Shijie Luo <luoshijie1@huawei.com>
Yeah, looks good. Once ext4_handle_dirty_metadata() fails, the journal is
aborted anyway so we are unlikely to do anything useful with the
filesystem. Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ext4/inode.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 650c5acd2f2d..8074ae0e976d 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -5026,7 +5026,7 @@ static int ext4_do_update_inode(handle_t *handle,
> struct ext4_inode_info *ei = EXT4_I(inode);
> struct buffer_head *bh = iloc->bh;
> struct super_block *sb = inode->i_sb;
> - int err = 0, rc, block;
> + int err = 0, block;
> int need_datasync = 0, set_large_file = 0;
> uid_t i_uid;
> gid_t i_gid;
> @@ -5138,9 +5138,9 @@ static int ext4_do_update_inode(handle_t *handle,
> bh->b_data);
>
> BUFFER_TRACE(bh, "call ext4_handle_dirty_metadata");
> - rc = ext4_handle_dirty_metadata(handle, NULL, bh);
> - if (!err)
> - err = rc;
> + err = ext4_handle_dirty_metadata(handle, NULL, bh);
> + if (err)
> + goto out_brelse;
> ext4_clear_inode_state(inode, EXT4_STATE_NEW);
> if (set_large_file) {
> BUFFER_TRACE(EXT4_SB(sb)->s_sbh, "get write access");
> --
> 2.19.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2021-03-12 12:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 6:50 [PATCH] ext4: fix potential error in ext4_do_update_inode Shijie Luo
2021-03-12 12:50 ` Jan Kara [this message]
2021-03-21 4:26 ` 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=20210312125055.GB31816@quack2.suse.cz \
--to=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=luoshijie1@huawei.com \
--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 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.