diff options
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/bitmap.c | 4 | ||||
-rw-r--r-- | drivers/md/md.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 26ac8aad0b1..f084249295d 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -1678,9 +1678,9 @@ int bitmap_create(mddev_t *mddev) | |||
1678 | 1678 | ||
1679 | bitmap->mddev = mddev; | 1679 | bitmap->mddev = mddev; |
1680 | 1680 | ||
1681 | bm = sysfs_get_dirent(mddev->kobj.sd, "bitmap"); | 1681 | bm = sysfs_get_dirent(mddev->kobj.sd, NULL, "bitmap"); |
1682 | if (bm) { | 1682 | if (bm) { |
1683 | bitmap->sysfs_can_clear = sysfs_get_dirent(bm, "can_clear"); | 1683 | bitmap->sysfs_can_clear = sysfs_get_dirent(bm, NULL, "can_clear"); |
1684 | sysfs_put(bm); | 1684 | sysfs_put(bm); |
1685 | } else | 1685 | } else |
1686 | bitmap->sysfs_can_clear = NULL; | 1686 | bitmap->sysfs_can_clear = NULL; |
diff --git a/drivers/md/md.c b/drivers/md/md.c index cefd63daff3..a9fd491796a 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -1766,7 +1766,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev) | |||
1766 | kobject_del(&rdev->kobj); | 1766 | kobject_del(&rdev->kobj); |
1767 | goto fail; | 1767 | goto fail; |
1768 | } | 1768 | } |
1769 | rdev->sysfs_state = sysfs_get_dirent(rdev->kobj.sd, "state"); | 1769 | rdev->sysfs_state = sysfs_get_dirent(rdev->kobj.sd, NULL, "state"); |
1770 | 1770 | ||
1771 | list_add_rcu(&rdev->same_set, &mddev->disks); | 1771 | list_add_rcu(&rdev->same_set, &mddev->disks); |
1772 | bd_claim_by_disk(rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk); | 1772 | bd_claim_by_disk(rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk); |
@@ -4189,7 +4189,7 @@ static int md_alloc(dev_t dev, char *name) | |||
4189 | mutex_unlock(&disks_mutex); | 4189 | mutex_unlock(&disks_mutex); |
4190 | if (!error) { | 4190 | if (!error) { |
4191 | kobject_uevent(&mddev->kobj, KOBJ_ADD); | 4191 | kobject_uevent(&mddev->kobj, KOBJ_ADD); |
4192 | mddev->sysfs_state = sysfs_get_dirent(mddev->kobj.sd, "array_state"); | 4192 | mddev->sysfs_state = sysfs_get_dirent(mddev->kobj.sd, NULL, "array_state"); |
4193 | } | 4193 | } |
4194 | mddev_put(mddev); | 4194 | mddev_put(mddev); |
4195 | return error; | 4195 | return error; |
@@ -4398,7 +4398,7 @@ static int do_md_run(mddev_t * mddev) | |||
4398 | printk(KERN_WARNING | 4398 | printk(KERN_WARNING |
4399 | "md: cannot register extra attributes for %s\n", | 4399 | "md: cannot register extra attributes for %s\n", |
4400 | mdname(mddev)); | 4400 | mdname(mddev)); |
4401 | mddev->sysfs_action = sysfs_get_dirent(mddev->kobj.sd, "sync_action"); | 4401 | mddev->sysfs_action = sysfs_get_dirent(mddev->kobj.sd, NULL, "sync_action"); |
4402 | } else if (mddev->ro == 2) /* auto-readonly not meaningful */ | 4402 | } else if (mddev->ro == 2) /* auto-readonly not meaningful */ |
4403 | mddev->ro = 0; | 4403 | mddev->ro = 0; |
4404 | 4404 | ||