[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20151230210832.vzhwzngdaicadtpu@ret.masoncoding.com>
Date: Wed, 30 Dec 2015 16:08:32 -0500
From: Chris Mason <clm@...com>
To: Nicholas Krause <xerofoify@...il.com>
CC: <jbacik@...com>, <dsterba@...e.com>, <linux-btrfs@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH RESEND 2/2] btrfs:Fix error handling in the function
btrfs_dev_replace_kthread
On Tue, Dec 29, 2015 at 08:10:07PM -0500, Nicholas Krause wrote:
> This fixes error handling in the function btrfs_dev_replace_kthread
> by checking if the call to the function btrfs_dev_replace_continue_on_mount
> has failed and if so return the error code to this function's caller in
> order to signal a failure has occurred when calling this particular
> function.
>
> Signed-off-by: Nicholas Krause <xerofoify@...il.com>
> ---
> fs/btrfs/dev-replace.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
> index 38ffd73..b26f68c 100644
> --- a/fs/btrfs/dev-replace.c
> +++ b/fs/btrfs/dev-replace.c
> @@ -803,6 +803,7 @@ static int btrfs_dev_replace_kthread(void *data)
> struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
> struct btrfs_ioctl_dev_replace_args *status_args;
> u64 progress;
> + int ret;
>
> status_args = kzalloc(sizeof(*status_args), GFP_NOFS);
> if (status_args) {
> @@ -820,7 +821,9 @@ static int btrfs_dev_replace_kthread(void *data)
> "<missing target disk>",
> (unsigned int)progress);
> }
> - btrfs_dev_replace_continue_on_mount(fs_info);
> + ret = btrfs_dev_replace_continue_on_mount(fs_info);
> + if (ret)
> + return ret;
> atomic_set(&fs_info->mutually_exclusive_operation_running, 0);
This atomic_set that you're skipping is really important.
-chris
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists