[v5,3/8] md: clean up invalid BUG_ON in md_ioctl

Message ID 20240201063404.772797-4-linan666@huaweicloud.com
State New
Headers
Series bugfix of MD_CLOSING and clean up md_ioctl() |

Commit Message

Li Nan Feb. 1, 2024, 6:33 a.m. UTC
  From: Li Nan <linan122@huawei.com>

'disk->private_data' is set to mddev in md_alloc() and never set to NULL,
and users need to open mddev before submitting ioctl. So mddev must not
have been freed during ioctl, and there is no need to check mddev here.
Clean up it.

Signed-off-by: Li Nan <linan122@huawei.com>
---
 drivers/md/md.c | 5 -----
 1 file changed, 5 deletions(-)
  

Comments

Yu Kuai Feb. 2, 2024, 1:20 a.m. UTC | #1
在 2024/02/01 14:33, linan666@huaweicloud.com 写道:
> From: Li Nan <linan122@huawei.com>
> 
> 'disk->private_data' is set to mddev in md_alloc() and never set to NULL,
> and users need to open mddev before submitting ioctl. So mddev must not
> have been freed during ioctl, and there is no need to check mddev here.
> Clean up it.
> 
> Signed-off-by: Li Nan <linan122@huawei.com>
> ---
>   drivers/md/md.c | 5 -----
>   1 file changed, 5 deletions(-)
> 
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 3b4e0ef49675..656080086052 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -7647,11 +7647,6 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
>   
>   	mddev = bdev->bd_disk->private_data;
>   
> -	if (!mddev) {
> -		BUG();

Given that this BUG() never triggered before.

Reviewed-by: Yu Kuai <yukuai3@huawei.com>

> -		goto out;
> -	}
> -
>   	/* Some actions do not requires the mutex */
>   	switch (cmd) {
>   	case GET_ARRAY_INFO:
>
  

Patch

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3b4e0ef49675..656080086052 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7647,11 +7647,6 @@  static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
 
 	mddev = bdev->bd_disk->private_data;
 
-	if (!mddev) {
-		BUG();
-		goto out;
-	}
-
 	/* Some actions do not requires the mutex */
 	switch (cmd) {
 	case GET_ARRAY_INFO: