diff options
| author | Tejun Heo <tj@kernel.org> | 2008-08-25 19:56:11 +0900 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 08:56:08 +0200 |
| commit | 4c46501d1659475dc6c89554af6ce7fe6ecf615c (patch) | |
| tree | 03bfdf77e2d20c3190ba62532c783ab7f6a2640d /fs/block_dev.c | |
| parent | b7db9956e57c8151b930d5e5fe5c766e6aad3ff7 (diff) | |
| download | op-kernel-dev-4c46501d1659475dc6c89554af6ce7fe6ecf615c.zip op-kernel-dev-4c46501d1659475dc6c89554af6ce7fe6ecf615c.tar.gz | |
block: move holder_dir from disk to part0
Move disk->holder_dir to part0->holder_dir. Kill now mostly
superflous bdev_get_holder().
While at it, kill superflous kobject_get/put() around holder_dir,
slave_dir and cmd_filter creation and collapse
disk_sysfs_add_subdirs() into register_disk(). These serve no purpose
but obfuscating the code.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index c982a91..57d5726 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) return kobject_get(&disk_to_dev(bdev->bd_disk)->kobj); } -static struct kobject *bdev_get_holder(struct block_device *bdev) -{ - if (bdev->bd_contains != bdev) - return kobject_get(bdev->bd_part->holder_dir); - else - return kobject_get(bdev->bd_disk->holder_dir); -} - static int add_symlink(struct kobject *from, struct kobject *to) { if (!from || !to) @@ -608,7 +600,7 @@ static int bd_holder_grab_dirs(struct block_device *bdev, if (!bo->sdev) goto fail_put_hdev; - bo->hdir = bdev_get_holder(bdev); + bo->hdir = kobject_get(bdev->bd_part->holder_dir); if (!bo->hdir) goto fail_put_sdev; |
