Received-SPF: pass (google.com: domain of linux-kernel+bounces-49060-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Subject: Re: [PATCH v5 4/8] md: return directly before setting
 did_set_md_closing
To: linan666@huaweicloud.com, song@kernel.org, neilb@suse.com,
 mariusz.tkaczyk@linux.intel.com, shli@fb.com
Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org,
 yi.zhang@huawei.com, houtao1@huawei.com, yangerkun@huawei.com,
 "yukuai (C)" <yukuai3@huawei.com>
References: <20240201063404.772797-1-linan666@huaweicloud.com>
 <20240201063404.772797-5-linan666@huaweicloud.com>
From: Yu Kuai <yukuai1@huaweicloud.com>
Message-ID: <029ed81c-aa85-ed1b-73e4-a1d0c86064ce@huaweicloud.com>
Date: Fri, 2 Feb 2024 09:24:50 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101
 Thunderbird/60.8.0
Precedence: bulk
MIME-Version: 1.0
In-Reply-To: <20240201063404.772797-5-linan666@huaweicloud.com>
Content-Type: text/plain; charset=gbk; format=flowed
Content-Transfer-Encoding: 8bit

Hi,

?? 2024/02/01 14:34, linan666@huaweicloud.com д??:
> From: Li Nan <linan122@huawei.com>
> 
> There is nothing to do at 'out' before setting 'did_set_md_closing'
> in md_ioctl(). Return directly, and it will help us to remove
> 'did_set_md_closing' later.
> 
> Signed-off-by: Li Nan <linan122@huawei.com>
> ---
>   drivers/md/md.c | 23 ++++++++---------------
>   1 file changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 656080086052..5442e8e3c161 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -7636,10 +7636,8 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
>   	 * Commands dealing with the RAID driver but not any
>   	 * particular array:
>   	 */
> -	if (cmd == RAID_VERSION) {
> -		err = get_version(argp);
> -		goto out;
> -	}
> +	if (cmd == RAID_VERSION)
> +		return get_version(argp);
Please merge this into patch 2.

>   
>   	/*
>   	 * Commands creating/starting a new array:
> @@ -7654,23 +7652,20 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
>   			err = -ENODEV;
>   		else
>   			err = get_array_info(mddev, argp);

You can also remove 'err' here:

if (...)
	return -ENODEV;
return get_array_info(mddev, argp);

> -		goto out;
> +		return err;
>   
>   	case GET_DISK_INFO:
>   		if (!mddev->raid_disks && !mddev->external)
>   			err = -ENODEV;
>   		else
>   			err = get_disk_info(mddev, argp);

Same here.

Thanks,
Kuai

> -		goto out;
> +		return err;
>   
>   	case SET_DISK_FAULTY:
> -		err = set_disk_faulty(mddev, new_decode_dev(arg));
> -		goto out;
> +		return set_disk_faulty(mddev, new_decode_dev(arg));
>   
>   	case GET_BITMAP_FILE:
> -		err = get_bitmap_file(mddev, argp);
> -		goto out;
> -
> +		return get_bitmap_file(mddev, argp);
>   	}
>   
>   	if (cmd == HOT_REMOVE_DISK)
> @@ -7686,13 +7681,11 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
>   		mutex_lock(&mddev->open_mutex);
>   		if (mddev->pers && atomic_read(&mddev->openers) > 1) {
>   			mutex_unlock(&mddev->open_mutex);
> -			err = -EBUSY;
> -			goto out;
> +			return -EBUSY;
>   		}
>   		if (test_and_set_bit(MD_CLOSING, &mddev->flags)) {
>   			mutex_unlock(&mddev->open_mutex);
> -			err = -EBUSY;
> -			goto out;
> +			return -EBUSY;
>   		}
>   		did_set_md_closing = true;
>   		mutex_unlock(&mddev->open_mutex);
>