Re: [PATCH] md: remove unused mddev argument from export_rdev

Dear Chen,


Am 04.03.26 um 12:14 schrieb Chen Cheng:
> The mddev argument in export_rdev() is never used. Remove it to
> simplify callers.

Nice catch. Was it like this from the beginning? Was the compiler 
noticing this itself, so the code stays the same?

> Signed-off-by: Chen Cheng <[email protected]>
> ---
>   drivers/md/md.c | 28 ++++++++++++++--------------
>   1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index c2cc2302d727..521d9b34cd9e 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -98,7 +98,7 @@ static struct workqueue_struct *md_misc_wq;
>   static int remove_and_add_spares(struct mddev *mddev,
>   				 struct md_rdev *this);
>   static void mddev_detach(struct mddev *mddev);
> -static void export_rdev(struct md_rdev *rdev, struct mddev *mddev);
> +static void export_rdev(struct md_rdev *rdev);
>   static void md_wakeup_thread_directly(struct md_thread __rcu **thread);
>   
>   /*
> @@ -959,7 +959,7 @@ void mddev_unlock(struct mddev *mddev)
>   	list_for_each_entry_safe(rdev, tmp, &delete, same_set) {
>   		list_del_init(&rdev->same_set);
>   		kobject_del(&rdev->kobj);
> -		export_rdev(rdev, mddev);
> +		export_rdev(rdev);
>   	}
>   
>   	if (!legacy_async_del_gendisk) {
> @@ -2632,7 +2632,7 @@ void md_autodetect_dev(dev_t dev);
>   /* just for claiming the bdev */
>   static struct md_rdev claim_rdev;
>   
> -static void export_rdev(struct md_rdev *rdev, struct mddev *mddev)
> +static void export_rdev(struct md_rdev *rdev)
>   {
>   	pr_debug("md: export_rdev(%pg)\n", rdev->bdev);
>   	md_rdev_clear(rdev);
> @@ -4850,7 +4850,7 @@ new_dev_store(struct mddev *mddev, const char *buf, size_t len)
>   	err = bind_rdev_to_array(rdev, mddev);
>    out:
>   	if (err)
> -		export_rdev(rdev, mddev);
> +		export_rdev(rdev);
>   	mddev_unlock_and_resume(mddev);
>   	if (!err)
>   		md_new_event();
> @@ -7142,7 +7142,7 @@ static void autorun_devices(int part)
>   			rdev_for_each_list(rdev, tmp, &candidates) {
>   				list_del_init(&rdev->same_set);
>   				if (bind_rdev_to_array(rdev, mddev))
> -					export_rdev(rdev, mddev);
> +					export_rdev(rdev);
>   			}
>   			autorun_array(mddev);
>   			mddev_unlock_and_resume(mddev);
> @@ -7152,7 +7152,7 @@ static void autorun_devices(int part)
>   		 */
>   		rdev_for_each_list(rdev, tmp, &candidates) {
>   			list_del_init(&rdev->same_set);
> -			export_rdev(rdev, mddev);
> +			export_rdev(rdev);
>   		}
>   		mddev_put(mddev);
>   	}
> @@ -7340,13 +7340,13 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
>   				pr_warn("md: %pg has different UUID to %pg\n",
>   					rdev->bdev,
>   					rdev0->bdev);
> -				export_rdev(rdev, mddev);
> +				export_rdev(rdev);
>   				return -EINVAL;
>   			}
>   		}
>   		err = bind_rdev_to_array(rdev, mddev);
>   		if (err)
> -			export_rdev(rdev, mddev);
> +			export_rdev(rdev);
>   		return err;
>   	}
>   
> @@ -7389,7 +7389,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
>   			/* This was a hot-add request, but events doesn't
>   			 * match, so reject it.
>   			 */
> -			export_rdev(rdev, mddev);
> +			export_rdev(rdev);
>   			return -EINVAL;
>   		}
>   
> @@ -7415,7 +7415,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
>   				}
>   			}
>   			if (has_journal || mddev->bitmap) {
> -				export_rdev(rdev, mddev);
> +				export_rdev(rdev);
>   				return -EBUSY;
>   			}
>   			set_bit(Journal, &rdev->flags);
> @@ -7430,7 +7430,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
>   				/* --add initiated by this node */
>   				err = mddev->cluster_ops->add_new_disk(mddev, rdev);
>   				if (err) {
> -					export_rdev(rdev, mddev);
> +					export_rdev(rdev);
>   					return err;
>   				}
>   			}
> @@ -7440,7 +7440,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
>   		err = bind_rdev_to_array(rdev, mddev);
>   
>   		if (err)
> -			export_rdev(rdev, mddev);
> +			export_rdev(rdev);
>   
>   		if (mddev_is_clustered(mddev)) {
>   			if (info->state & (1 << MD_DISK_CANDIDATE)) {
> @@ -7503,7 +7503,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
>   
>   		err = bind_rdev_to_array(rdev, mddev);
>   		if (err) {
> -			export_rdev(rdev, mddev);
> +			export_rdev(rdev);
>   			return err;
>   		}
>   	}
> @@ -7615,7 +7615,7 @@ static int hot_add_disk(struct mddev *mddev, dev_t dev)
>   	return 0;
>   
>   abort_export:
> -	export_rdev(rdev, mddev);
> +	export_rdev(rdev);
>   	return err;
>   }

The diff looks good:

Reviewed-by: Paul Menzel <[email protected]>


Kind regards,

Paul