From caec3430825ab17d9cc43e43d8f7dff847e08f79 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 8 Nov 2005 21:39:37 -0800 Subject: [PATCH] --- yaml --- r: 13499 b: refs/heads/master c: f637b9f9fc195e4f4635faf495fd8b462c21b411 h: refs/heads/master i: 13497: b7914d2512293025bf6cdece89bdf1ae038f19ce 13495: f39b90e66b146510da0e31a393e5852544057a86 v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5ea9fda6941b..ff2983da418d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f91de92ed6bfb70a3ff607558c910c7bf34d45e9 +refs/heads/master: f637b9f9fc195e4f4635faf495fd8b462c21b411 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index d002b8301fc2..2b5928976095 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -1182,6 +1182,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev) { mdk_rdev_t *same_pdev; char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE]; + struct kobject *ko; if (rdev->mddev) { MD_BUG(); @@ -1221,7 +1222,11 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev) rdev->kobj.parent = &mddev->kobj; kobject_add(&rdev->kobj); - sysfs_create_link(&rdev->kobj, &rdev->bdev->bd_disk->kobj, "block"); + if (rdev->bdev->bd_part) + ko = &rdev->bdev->bd_part->kobj; + else + ko = &rdev->bdev->bd_disk->kobj; + sysfs_create_link(&rdev->kobj, ko, "block"); return 0; }