lkml.org 
[lkml]   [2020]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v2] btrfs: return EAGAIN when receiving a pending signal in the defrag loops
From
Date
On 18/11/20 12:02 pm, xiakaixu1987@gmail.com wrote:
> From: Kaixu Xia <kaixuxia@tencent.com>
>
> The variable ret is overwritten by the following variable defrag_count.
> Actually the code should return EAGAIN when receiving a pending signal
> in the defrag loops.
>
> Reported-by: Tosk Robot <tencent_os_robot@tencent.com>
> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
> ---
> v2
> -return EAGAIN instead of remove the EAGAIN error.

Sorry I might have missed in v1. Why was EAGAIN needed here?
Return of defrag_count rather makes sense to me as of now.

Thanks, Anand

>
> fs/btrfs/ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index 69a384145dc6..6f13db6d30bd 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -1519,7 +1519,7 @@ 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;
> + goto out_ra;
> }
>
> if (!should_defrag_range(inode, (u64)i << PAGE_SHIFT,
>

\
 
 \ /
  Last update: 2020-11-18 10:57    [W:0.054 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site