aboutsummaryrefslogtreecommitdiffstats
path: root/fs/block_dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r--fs/block_dev.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index c982a9107979..57d572642854 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -548,14 +548,6 @@ static struct kobject *bdev_get_kobj(struct block_device *bdev)
548 return kobject_get(&disk_to_dev(bdev->bd_disk)->kobj); 548 return kobject_get(&disk_to_dev(bdev->bd_disk)->kobj);
549} 549}
550 550
551static struct kobject *bdev_get_holder(struct block_device *bdev)
552{
553 if (bdev->bd_contains != bdev)
554 return kobject_get(bdev->bd_part->holder_dir);
555 else
556 return kobject_get(bdev->bd_disk->holder_dir);
557}
558
559static int add_symlink(struct kobject *from, struct kobject *to) 551static int add_symlink(struct kobject *from, struct kobject *to)
560{ 552{
561 if (!from || !to) 553 if (!from || !to)
@@ -608,7 +600,7 @@ static int bd_holder_grab_dirs(struct block_device *bdev,
608 if (!bo->sdev) 600 if (!bo->sdev)
609 goto fail_put_hdev; 601 goto fail_put_hdev;
610 602
611 bo->hdir = bdev_get_holder(bdev); 603 bo->hdir = kobject_get(bdev->bd_part->holder_dir);
612 if (!bo->hdir) 604 if (!bo->hdir)
613 goto fail_put_sdev; 605 goto fail_put_sdev;
614 606