From: Ritesh Harjani <riteshh@linux.ibm.com>
To: zhengliang <zhengliang6@huawei.com>,
tytso@mit.edu, adilger.kernel@dilger.ca
Cc: linux-ext4@vger.kernel.org
Subject: Re: [PATCH v2] ext4: lost matching-pair of trace in ext4_truncate
Date: Wed, 8 Jul 2020 15:33:17 +0530 [thread overview]
Message-ID: <20200708100318.59AD8A406B@b06wcsmtp001.portsmouth.uk.ibm.com> (raw)
In-Reply-To: <20200701083027.45996-1-zhengliang6@huawei.com>
On 7/1/20 2:00 PM, zhengliang wrote:
> It should call trace exit in all return path for ext4_truncate.
>
> v2:
> It shoule call trace exit in all return path, and add "out_trace" label to avoid the
> multiple copies of the cleanup code in each error case.
v2 description should generally go below three dashed line so that
it need not become part of commit msg.
>
> Signed-off-by: zhengliang <zhengliang6@huawei.com>
LGTM, feel free to add
Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
> ---
> fs/ext4/inode.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 10dd470876b3..6187c8880c02 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -4163,7 +4163,7 @@ int ext4_truncate(struct inode *inode)
> trace_ext4_truncate_enter(inode);
>
> if (!ext4_can_truncate(inode))
> - return 0;
> + goto out_trace;
>
> if (inode->i_size == 0 && !test_opt(inode->i_sb, NO_AUTO_DA_ALLOC))
> ext4_set_inode_state(inode, EXT4_STATE_DA_ALLOC_CLOSE);
> @@ -4172,16 +4172,14 @@ int ext4_truncate(struct inode *inode)
> int has_inline = 1;
>
> err = ext4_inline_data_truncate(inode, &has_inline);
> - if (err)
> - return err;
> - if (has_inline)
> - return 0;
> + if (err || has_inline)
> + goto out_trace;
> }
>
> /* If we zero-out tail of the page, we have to create jinode for jbd2 */
> if (inode->i_size & (inode->i_sb->s_blocksize - 1)) {
> if (ext4_inode_attach_jinode(inode) < 0)
> - return 0;
> + goto out_trace;
> }
>
> if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
> @@ -4190,8 +4188,10 @@ int ext4_truncate(struct inode *inode)
> credits = ext4_blocks_for_truncate(inode);
>
> handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, credits);
> - if (IS_ERR(handle))
> - return PTR_ERR(handle);
> + if (IS_ERR(handle)) {
> + err = PTR_ERR(handle);
> + goto out_trace;
> + }
>
> if (inode->i_size & (inode->i_sb->s_blocksize - 1))
> ext4_block_truncate_page(handle, mapping, inode->i_size);
> @@ -4242,6 +4242,7 @@ int ext4_truncate(struct inode *inode)
> err = err2;
> ext4_journal_stop(handle);
>
> +out_trace:
> trace_ext4_truncate_exit(inode);
> return err;
> }
>
next prev parent reply other threads:[~2020-07-08 10:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-01 8:30 [PATCH v2] ext4: lost matching-pair of trace in ext4_truncate zhengliang
2020-07-05 5:50 ` Andreas Dilger
2020-07-08 10:03 ` Ritesh Harjani [this message]
2020-08-06 4:53 ` tytso
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=20200708100318.59AD8A406B@b06wcsmtp001.portsmouth.uk.ibm.com \
--to=riteshh@linux.ibm.com \
--cc=adilger.kernel@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=zhengliang6@huawei.com \
/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).