Skip to content

Commit f8d56f1

Browse files
committed
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md: allow extended partitions on md devices. md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state md: use sysfs_notify_dirent to notify changes to md/array_state
2 parents 3d6eadc + 92850bb commit f8d56f1

File tree

2 files changed

+40
-24
lines changed

2 files changed

+40
-24
lines changed

drivers/md/md.c

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,9 @@ static void mddev_put(mddev_t *mddev)
222222
list_del(&mddev->all_mddevs);
223223
spin_unlock(&all_mddevs_lock);
224224
blk_cleanup_queue(mddev->queue);
225+
if (mddev->sysfs_state)
226+
sysfs_put(mddev->sysfs_state);
227+
mddev->sysfs_state = NULL;
225228
kobject_put(&mddev->kobj);
226229
} else
227230
spin_unlock(&all_mddevs_lock);
@@ -1459,6 +1462,8 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
14591462
kobject_del(&rdev->kobj);
14601463
goto fail;
14611464
}
1465+
rdev->sysfs_state = sysfs_get_dirent(rdev->kobj.sd, "state");
1466+
14621467
list_add_rcu(&rdev->same_set, &mddev->disks);
14631468
bd_claim_by_disk(rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk);
14641469
return 0;
@@ -1488,7 +1493,8 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)
14881493
printk(KERN_INFO "md: unbind<%s>\n", bdevname(rdev->bdev,b));
14891494
rdev->mddev = NULL;
14901495
sysfs_remove_link(&rdev->kobj, "block");
1491-
1496+
sysfs_put(rdev->sysfs_state);
1497+
rdev->sysfs_state = NULL;
14921498
/* We need to delay this, otherwise we can deadlock when
14931499
* writing to 'remove' to "dev/state". We also need
14941500
* to delay it due to rcu usage.
@@ -1923,8 +1929,8 @@ state_store(mdk_rdev_t *rdev, const char *buf, size_t len)
19231929

19241930
err = 0;
19251931
}
1926-
if (!err)
1927-
sysfs_notify(&rdev->kobj, NULL, "state");
1932+
if (!err && rdev->sysfs_state)
1933+
sysfs_notify_dirent(rdev->sysfs_state);
19281934
return err ? err : len;
19291935
}
19301936
static struct rdev_sysfs_entry rdev_state =
@@ -2019,7 +2025,7 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
20192025
rdev->raid_disk = -1;
20202026
return err;
20212027
} else
2022-
sysfs_notify(&rdev->kobj, NULL, "state");
2028+
sysfs_notify_dirent(rdev->sysfs_state);
20232029
sprintf(nm, "rd%d", rdev->raid_disk);
20242030
if (sysfs_create_link(&rdev->mddev->kobj, &rdev->kobj, nm))
20252031
printk(KERN_WARNING
@@ -2036,7 +2042,7 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
20362042
clear_bit(Faulty, &rdev->flags);
20372043
clear_bit(WriteMostly, &rdev->flags);
20382044
set_bit(In_sync, &rdev->flags);
2039-
sysfs_notify(&rdev->kobj, NULL, "state");
2045+
sysfs_notify_dirent(rdev->sysfs_state);
20402046
}
20412047
return len;
20422048
}
@@ -2770,7 +2776,7 @@ array_state_store(mddev_t *mddev, const char *buf, size_t len)
27702776
if (err)
27712777
return err;
27722778
else {
2773-
sysfs_notify(&mddev->kobj, NULL, "array_state");
2779+
sysfs_notify_dirent(mddev->sysfs_state);
27742780
return len;
27752781
}
27762782
}
@@ -3457,6 +3463,11 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
34573463
disk->fops = &md_fops;
34583464
disk->private_data = mddev;
34593465
disk->queue = mddev->queue;
3466+
/* Allow extended partitions. This makes the
3467+
* 'mdp' device redundant, but we can really
3468+
* remove it now.
3469+
*/
3470+
disk->flags |= GENHD_FL_EXT_DEVT;
34603471
add_disk(disk);
34613472
mddev->gendisk = disk;
34623473
error = kobject_init_and_add(&mddev->kobj, &md_ktype,
@@ -3465,8 +3476,10 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
34653476
if (error)
34663477
printk(KERN_WARNING "md: cannot register %s/md - name in use\n",
34673478
disk->disk_name);
3468-
else
3479+
else {
34693480
kobject_uevent(&mddev->kobj, KOBJ_ADD);
3481+
mddev->sysfs_state = sysfs_get_dirent(mddev->kobj.sd, "array_state");
3482+
}
34703483
return NULL;
34713484
}
34723485

@@ -3477,7 +3490,7 @@ static void md_safemode_timeout(unsigned long data)
34773490
if (!atomic_read(&mddev->writes_pending)) {
34783491
mddev->safemode = 1;
34793492
if (mddev->external)
3480-
set_bit(MD_NOTIFY_ARRAY_STATE, &mddev->flags);
3493+
sysfs_notify_dirent(mddev->sysfs_state);
34813494
}
34823495
md_wakeup_thread(mddev->thread);
34833496
}
@@ -3578,7 +3591,7 @@ static int do_md_run(mddev_t * mddev)
35783591
return -EINVAL;
35793592
}
35803593
}
3581-
sysfs_notify(&rdev->kobj, NULL, "state");
3594+
sysfs_notify_dirent(rdev->sysfs_state);
35823595
}
35833596

35843597
md_probe(mddev->unit, NULL, NULL);
@@ -3740,7 +3753,7 @@ static int do_md_run(mddev_t * mddev)
37403753

37413754
mddev->changed = 1;
37423755
md_new_event(mddev);
3743-
sysfs_notify(&mddev->kobj, NULL, "array_state");
3756+
sysfs_notify_dirent(mddev->sysfs_state);
37443757
sysfs_notify(&mddev->kobj, NULL, "sync_action");
37453758
sysfs_notify(&mddev->kobj, NULL, "degraded");
37463759
kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);
@@ -3767,7 +3780,7 @@ static int restart_array(mddev_t *mddev)
37673780
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
37683781
md_wakeup_thread(mddev->thread);
37693782
md_wakeup_thread(mddev->sync_thread);
3770-
sysfs_notify(&mddev->kobj, NULL, "array_state");
3783+
sysfs_notify_dirent(mddev->sysfs_state);
37713784
return 0;
37723785
}
37733786

@@ -3847,7 +3860,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
38473860
module_put(mddev->pers->owner);
38483861
mddev->pers = NULL;
38493862
/* tell userspace to handle 'inactive' */
3850-
sysfs_notify(&mddev->kobj, NULL, "array_state");
3863+
sysfs_notify_dirent(mddev->sysfs_state);
38513864

38523865
set_capacity(disk, 0);
38533866
mddev->changed = 1;
@@ -3933,7 +3946,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
39333946
mdname(mddev));
39343947
err = 0;
39353948
md_new_event(mddev);
3936-
sysfs_notify(&mddev->kobj, NULL, "array_state");
3949+
sysfs_notify_dirent(mddev->sysfs_state);
39373950
out:
39383951
return err;
39393952
}
@@ -4297,7 +4310,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
42974310
if (err)
42984311
export_rdev(rdev);
42994312
else
4300-
sysfs_notify(&rdev->kobj, NULL, "state");
4313+
sysfs_notify_dirent(rdev->sysfs_state);
43014314

43024315
md_update_sb(mddev, 1);
43034316
if (mddev->degraded)
@@ -4938,7 +4951,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
49384951
if (_IOC_TYPE(cmd) == MD_MAJOR && mddev->ro && mddev->pers) {
49394952
if (mddev->ro == 2) {
49404953
mddev->ro = 0;
4941-
sysfs_notify(&mddev->kobj, NULL, "array_state");
4954+
sysfs_notify_dirent(mddev->sysfs_state);
49424955
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
49434956
md_wakeup_thread(mddev->thread);
49444957
} else {
@@ -5612,7 +5625,7 @@ void md_write_start(mddev_t *mddev, struct bio *bi)
56125625
spin_unlock_irq(&mddev->write_lock);
56135626
}
56145627
if (did_change)
5615-
sysfs_notify(&mddev->kobj, NULL, "array_state");
5628+
sysfs_notify_dirent(mddev->sysfs_state);
56165629
wait_event(mddev->sb_wait,
56175630
!test_bit(MD_CHANGE_CLEAN, &mddev->flags) &&
56185631
!test_bit(MD_CHANGE_PENDING, &mddev->flags));
@@ -5655,7 +5668,7 @@ int md_allow_write(mddev_t *mddev)
56555668
mddev->safemode = 1;
56565669
spin_unlock_irq(&mddev->write_lock);
56575670
md_update_sb(mddev, 0);
5658-
sysfs_notify(&mddev->kobj, NULL, "array_state");
5671+
sysfs_notify_dirent(mddev->sysfs_state);
56595672
} else
56605673
spin_unlock_irq(&mddev->write_lock);
56615674

@@ -6048,9 +6061,6 @@ void md_check_recovery(mddev_t *mddev)
60486061
if (mddev->bitmap)
60496062
bitmap_daemon_work(mddev->bitmap);
60506063

6051-
if (test_and_clear_bit(MD_NOTIFY_ARRAY_STATE, &mddev->flags))
6052-
sysfs_notify(&mddev->kobj, NULL, "array_state");
6053-
60546064
if (mddev->ro)
60556065
return;
60566066

@@ -6103,15 +6113,15 @@ void md_check_recovery(mddev_t *mddev)
61036113
mddev->safemode = 0;
61046114
spin_unlock_irq(&mddev->write_lock);
61056115
if (did_change)
6106-
sysfs_notify(&mddev->kobj, NULL, "array_state");
6116+
sysfs_notify_dirent(mddev->sysfs_state);
61076117
}
61086118

61096119
if (mddev->flags)
61106120
md_update_sb(mddev, 0);
61116121

61126122
rdev_for_each(rdev, rtmp, mddev)
61136123
if (test_and_clear_bit(StateChanged, &rdev->flags))
6114-
sysfs_notify(&rdev->kobj, NULL, "state");
6124+
sysfs_notify_dirent(rdev->sysfs_state);
61156125

61166126

61176127
if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) &&
@@ -6221,7 +6231,7 @@ void md_check_recovery(mddev_t *mddev)
62216231

62226232
void md_wait_for_blocked_rdev(mdk_rdev_t *rdev, mddev_t *mddev)
62236233
{
6224-
sysfs_notify(&rdev->kobj, NULL, "state");
6234+
sysfs_notify_dirent(rdev->sysfs_state);
62256235
wait_event_timeout(rdev->blocked_wait,
62266236
!test_bit(Blocked, &rdev->flags),
62276237
msecs_to_jiffies(5000));

include/linux/raid/md_k.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ struct mdk_rdev_s
115115
* in superblock.
116116
*/
117117
struct work_struct del_work; /* used for delayed sysfs removal */
118+
119+
struct sysfs_dirent *sysfs_state; /* handle for 'state'
120+
* sysfs entry */
118121
};
119122

120123
struct mddev_s
@@ -128,7 +131,6 @@ struct mddev_s
128131
#define MD_CHANGE_DEVS 0 /* Some device status has changed */
129132
#define MD_CHANGE_CLEAN 1 /* transition to or from 'clean' */
130133
#define MD_CHANGE_PENDING 2 /* superblock update in progress */
131-
#define MD_NOTIFY_ARRAY_STATE 3 /* atomic context wants to notify userspace */
132134

133135
int ro;
134136

@@ -239,6 +241,10 @@ struct mddev_s
239241
sector_t resync_max; /* resync should pause
240242
* when it gets here */
241243

244+
struct sysfs_dirent *sysfs_state; /* handle for 'array_state'
245+
* file in sysfs.
246+
*/
247+
242248
spinlock_t write_lock;
243249
wait_queue_head_t sb_wait; /* for waiting on superblock updates */
244250
atomic_t pending_writes; /* number of active superblock writes */

0 commit comments

Comments
 (0)