@@ -98,7 +98,7 @@ static struct workqueue_struct *md_misc_wq;
9898static int remove_and_add_spares (struct mddev * mddev ,
9999 struct md_rdev * this );
100100static 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 );
102102static void md_wakeup_thread_directly (struct md_thread __rcu * * thread );
103103
104104/*
@@ -959,7 +959,7 @@ void mddev_unlock(struct mddev *mddev)
959959 list_for_each_entry_safe (rdev , tmp , & delete , same_set ) {
960960 list_del_init (& rdev -> same_set );
961961 kobject_del (& rdev -> kobj );
962- export_rdev (rdev , mddev );
962+ export_rdev (rdev );
963963 }
964964
965965 if (!legacy_async_del_gendisk ) {
@@ -2632,7 +2632,7 @@ void md_autodetect_dev(dev_t dev);
26322632/* just for claiming the bdev */
26332633static struct md_rdev claim_rdev ;
26342634
2635- static void export_rdev (struct md_rdev * rdev , struct mddev * mddev )
2635+ static void export_rdev (struct md_rdev * rdev )
26362636{
26372637 pr_debug ("md: export_rdev(%pg)\n" , rdev -> bdev );
26382638 md_rdev_clear (rdev );
@@ -4850,7 +4850,7 @@ new_dev_store(struct mddev *mddev, const char *buf, size_t len)
48504850 err = bind_rdev_to_array (rdev , mddev );
48514851 out :
48524852 if (err )
4853- export_rdev (rdev , mddev );
4853+ export_rdev (rdev );
48544854 mddev_unlock_and_resume (mddev );
48554855 if (!err )
48564856 md_new_event ();
@@ -7142,7 +7142,7 @@ static void autorun_devices(int part)
71427142 rdev_for_each_list (rdev , tmp , & candidates ) {
71437143 list_del_init (& rdev -> same_set );
71447144 if (bind_rdev_to_array (rdev , mddev ))
7145- export_rdev (rdev , mddev );
7145+ export_rdev (rdev );
71467146 }
71477147 autorun_array (mddev );
71487148 mddev_unlock_and_resume (mddev );
@@ -7152,7 +7152,7 @@ static void autorun_devices(int part)
71527152 */
71537153 rdev_for_each_list (rdev , tmp , & candidates ) {
71547154 list_del_init (& rdev -> same_set );
7155- export_rdev (rdev , mddev );
7155+ export_rdev (rdev );
71567156 }
71577157 mddev_put (mddev );
71587158 }
@@ -7340,13 +7340,13 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
73407340 pr_warn ("md: %pg has different UUID to %pg\n" ,
73417341 rdev -> bdev ,
73427342 rdev0 -> bdev );
7343- export_rdev (rdev , mddev );
7343+ export_rdev (rdev );
73447344 return - EINVAL ;
73457345 }
73467346 }
73477347 err = bind_rdev_to_array (rdev , mddev );
73487348 if (err )
7349- export_rdev (rdev , mddev );
7349+ export_rdev (rdev );
73507350 return err ;
73517351 }
73527352
@@ -7389,7 +7389,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
73897389 /* This was a hot-add request, but events doesn't
73907390 * match, so reject it.
73917391 */
7392- export_rdev (rdev , mddev );
7392+ export_rdev (rdev );
73937393 return - EINVAL ;
73947394 }
73957395
@@ -7415,7 +7415,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
74157415 }
74167416 }
74177417 if (has_journal || mddev -> bitmap ) {
7418- export_rdev (rdev , mddev );
7418+ export_rdev (rdev );
74197419 return - EBUSY ;
74207420 }
74217421 set_bit (Journal , & rdev -> flags );
@@ -7430,7 +7430,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
74307430 /* --add initiated by this node */
74317431 err = mddev -> cluster_ops -> add_new_disk (mddev , rdev );
74327432 if (err ) {
7433- export_rdev (rdev , mddev );
7433+ export_rdev (rdev );
74347434 return err ;
74357435 }
74367436 }
@@ -7440,7 +7440,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
74407440 err = bind_rdev_to_array (rdev , mddev );
74417441
74427442 if (err )
7443- export_rdev (rdev , mddev );
7443+ export_rdev (rdev );
74447444
74457445 if (mddev_is_clustered (mddev )) {
74467446 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)
75037503
75047504 err = bind_rdev_to_array (rdev , mddev );
75057505 if (err ) {
7506- export_rdev (rdev , mddev );
7506+ export_rdev (rdev );
75077507 return err ;
75087508 }
75097509 }
@@ -7615,7 +7615,7 @@ static int hot_add_disk(struct mddev *mddev, dev_t dev)
76157615 return 0 ;
76167616
76177617abort_export :
7618- export_rdev (rdev , mddev );
7618+ export_rdev (rdev );
76197619 return err ;
76207620}
76217621
0 commit comments