2020-11-14 09:09:20

by Kaixu Xia

[permalink] [raw]
Subject: [PATCH] btrfs: remove the useless value assignment in btrfs_defrag_file

From: Kaixu Xia <[email protected]>

The variable ret is overwritten by the following variable defrag_count
and this assignment is useless, so remove it.

Reported-by: Tosk Robot <[email protected]>
Signed-off-by: Kaixu Xia <[email protected]>
---
fs/btrfs/ioctl.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 69a384145dc6..5771678281d6 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1518,7 +1518,6 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,

if (btrfs_defrag_cancelled(fs_info)) {
btrfs_debug(fs_info, "defrag_file cancelled");
- ret = -EAGAIN;
break;
}

--
2.20.0


2020-11-16 15:21:45

by David Sterba

[permalink] [raw]
Subject: Re: [PATCH] btrfs: remove the useless value assignment in btrfs_defrag_file

On Sat, Nov 14, 2020 at 05:06:21PM +0800, [email protected] wrote:
> From: Kaixu Xia <[email protected]>
>
> The variable ret is overwritten by the following variable defrag_count
> and this assignment is useless, so remove it.

This could be actually pointing to a bug, please explain why you think
it's correct to remove it and not to return EAGAIN.

2020-11-17 02:55:44

by Kaixu Xia

[permalink] [raw]
Subject: Re: [PATCH] btrfs: remove the useless value assignment in btrfs_defrag_file



On 2020/11/16 23:13, David Sterba wrote:
> On Sat, Nov 14, 2020 at 05:06:21PM +0800, [email protected] wrote:
>> From: Kaixu Xia <[email protected]>
>>
>> The variable ret is overwritten by the following variable defrag_count
>> and this assignment is useless, so remove it.
>
> This could be actually pointing to a bug, please explain why you think
> it's correct to remove it and not to return EAGAIN.

The right fix should be goto out_ra and return EAGAIN. I will do it
in the next version.

Thanks,
Kaixu
>

--
kaixuxia