tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

md: remove unused mddev argument from export_rdev

The mddev argument in export_rdev() is never used. Remove it to
simplify callers.

Signed-off-by: Chen Cheng <chencheng@fnnas.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Link: https://lore.kernel.org/linux-raid/20260304111417.20777-1-chencheng@fnnas.com/
Signed-off-by: Yu Kuai <yukuai3@huawei.com>

authored by

Chen Cheng and committed by
Yu Kuai 6f507eb2 81c04126

+14 -14
+14 -14
drivers/md/md.c
··· 98 98 static int remove_and_add_spares(struct mddev *mddev, 99 99 struct md_rdev *this); 100 100 static void mddev_detach(struct mddev *mddev); 101 - static void export_rdev(struct md_rdev *rdev, struct mddev *mddev); 101 + static void export_rdev(struct md_rdev *rdev); 102 102 static void md_wakeup_thread_directly(struct md_thread __rcu **thread); 103 103 104 104 /* ··· 959 959 list_for_each_entry_safe(rdev, tmp, &delete, same_set) { 960 960 list_del_init(&rdev->same_set); 961 961 kobject_del(&rdev->kobj); 962 - export_rdev(rdev, mddev); 962 + export_rdev(rdev); 963 963 } 964 964 965 965 if (!legacy_async_del_gendisk) { ··· 2632 2632 /* just for claiming the bdev */ 2633 2633 static struct md_rdev claim_rdev; 2634 2634 2635 - static void export_rdev(struct md_rdev *rdev, struct mddev *mddev) 2635 + static void export_rdev(struct md_rdev *rdev) 2636 2636 { 2637 2637 pr_debug("md: export_rdev(%pg)\n", rdev->bdev); 2638 2638 md_rdev_clear(rdev); ··· 4850 4850 err = bind_rdev_to_array(rdev, mddev); 4851 4851 out: 4852 4852 if (err) 4853 - export_rdev(rdev, mddev); 4853 + export_rdev(rdev); 4854 4854 mddev_unlock_and_resume(mddev); 4855 4855 if (!err) 4856 4856 md_new_event(); ··· 7142 7142 rdev_for_each_list(rdev, tmp, &candidates) { 7143 7143 list_del_init(&rdev->same_set); 7144 7144 if (bind_rdev_to_array(rdev, mddev)) 7145 - export_rdev(rdev, mddev); 7145 + export_rdev(rdev); 7146 7146 } 7147 7147 autorun_array(mddev); 7148 7148 mddev_unlock_and_resume(mddev); ··· 7152 7152 */ 7153 7153 rdev_for_each_list(rdev, tmp, &candidates) { 7154 7154 list_del_init(&rdev->same_set); 7155 - export_rdev(rdev, mddev); 7155 + export_rdev(rdev); 7156 7156 } 7157 7157 mddev_put(mddev); 7158 7158 } ··· 7340 7340 pr_warn("md: %pg has different UUID to %pg\n", 7341 7341 rdev->bdev, 7342 7342 rdev0->bdev); 7343 - export_rdev(rdev, mddev); 7343 + export_rdev(rdev); 7344 7344 return -EINVAL; 7345 7345 } 7346 7346 } 7347 7347 err = bind_rdev_to_array(rdev, mddev); 7348 7348 if (err) 7349 - export_rdev(rdev, mddev); 7349 + export_rdev(rdev); 7350 7350 return err; 7351 7351 } 7352 7352 ··· 7389 7389 /* This was a hot-add request, but events doesn't 7390 7390 * match, so reject it. 7391 7391 */ 7392 - export_rdev(rdev, mddev); 7392 + export_rdev(rdev); 7393 7393 return -EINVAL; 7394 7394 } 7395 7395 ··· 7415 7415 } 7416 7416 } 7417 7417 if (has_journal || mddev->bitmap) { 7418 - export_rdev(rdev, mddev); 7418 + export_rdev(rdev); 7419 7419 return -EBUSY; 7420 7420 } 7421 7421 set_bit(Journal, &rdev->flags); ··· 7430 7430 /* --add initiated by this node */ 7431 7431 err = mddev->cluster_ops->add_new_disk(mddev, rdev); 7432 7432 if (err) { 7433 - export_rdev(rdev, mddev); 7433 + export_rdev(rdev); 7434 7434 return err; 7435 7435 } 7436 7436 } ··· 7440 7440 err = bind_rdev_to_array(rdev, mddev); 7441 7441 7442 7442 if (err) 7443 - export_rdev(rdev, mddev); 7443 + export_rdev(rdev); 7444 7444 7445 7445 if (mddev_is_clustered(mddev)) { 7446 7446 if (info->state & (1 << MD_DISK_CANDIDATE)) { ··· 7503 7503 7504 7504 err = bind_rdev_to_array(rdev, mddev); 7505 7505 if (err) { 7506 - export_rdev(rdev, mddev); 7506 + export_rdev(rdev); 7507 7507 return err; 7508 7508 } 7509 7509 } ··· 7615 7615 return 0; 7616 7616 7617 7617 abort_export: 7618 - export_rdev(rdev, mddev); 7618 + export_rdev(rdev); 7619 7619 return err; 7620 7620 } 7621 7621