On Fri, Apr 27, 2018 at 12:11:00PM -0400, Jeff Mahoney wrote:
> If we fail to allocate memory for a path, don't bother trying to
> insert the qgroup status item. We haven't done anything yet and it'll
> fail also. Just print an error and be done with it.
>
> Signed-off-by: Jeff Mahoney <je...@suse.com>
> ---
> fs/btrfs/qgroup.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
> index 8de423a0c7e3..b795bad54705 100644
> --- a/fs/btrfs/qgroup.c
> +++ b/fs/btrfs/qgroup.c
> @@ -2648,7 +2648,6 @@ static void btrfs_qgroup_rescan_worker(struct
> btrfs_work *work)
> btrfs_end_transaction(trans);
> }
>
> -out:
> btrfs_free_path(path);
>
> mutex_lock(&fs_info->qgroup_rescan_lock);
> @@ -2684,13 +2683,13 @@ static void btrfs_qgroup_rescan_worker(struct
> btrfs_work *work)
>
> if (btrfs_fs_closing(fs_info)) {
> btrfs_info(fs_info, "qgroup scan paused");
> - } else if (err >= 0) {
> + err = 0;
> + } else if (err >= 0)
> btrfs_info(fs_info, "qgroup scan completed%s",
> err > 0 ? " (inconsistency flag cleared)" : "");
> - } else {
> +out:
> + if (err < 0)
> btrfs_err(fs_info, "qgroup scan failed with %d", err);
Ah right, with the err = 0 in the fs_closing check we won't see both
messages reported, "qgroup scan paused" and "qgroup scan failed with %d".
Reviewed-by: David Sterba <dste...@suse.com>
> - }
> -
> done:
> mutex_lock(&fs_info->qgroup_rescan_lock);
> fs_info->qgroup_rescan_running = false;
> --
> 2.12.3
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
