Linux-ext4 Archive on lore.kernel.org
 help / color / Atom feed
From: Andreas Dilger <adilger@dilger.ca>
To: zhengliang <zhengliang6@huawei.com>
Cc: "Theodore Y. Ts'o" <tytso@mit.edu>,
	Ext4 Developers List <linux-ext4@vger.kernel.org>
Subject: Re: [PATCH v2] ext4: lost matching-pair of trace in ext4_truncate
Date: Sat, 4 Jul 2020 23:50:03 -0600
Message-ID: <96C68654-9923-4994-A191-D40678EB30CD@dilger.ca> (raw)
In-Reply-To: <20200701083027.45996-1-zhengliang6@huawei.com>


[-- Attachment #1: Type: text/plain, Size: 2279 bytes --]

On Jul 1, 2020, at 2:30 AM, zhengliang <zhengliang6@huawei.com> 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.
> 
> Signed-off-by: zhengliang <zhengliang6@huawei.com>

Thanks for the patch.  It looks good.

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> 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;
> }
> --
> 2.17.1
> 


Cheers, Andreas






[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 873 bytes --]

  reply index

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-01  8:30 zhengliang
2020-07-05  5:50 ` Andreas Dilger [this message]
2020-07-08 10:03 ` Ritesh Harjani
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=96C68654-9923-4994-A191-D40678EB30CD@dilger.ca \
    --to=adilger@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

Linux-ext4 Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-ext4/0 linux-ext4/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-ext4 linux-ext4/ https://lore.kernel.org/linux-ext4 \
		linux-ext4@vger.kernel.org
	public-inbox-index linux-ext4

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-ext4


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git