block: add a bdget_part helper

All remaining callers of bdget() outside of fs/block_dev.c want to get a
reference to the struct block_device for a given struct hd_struct.  Add
a helper just for that and then mark bdget static.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/genhd.c b/block/genhd.c
index e5f17f022ec7005cc63bdb40fd59c583a74ef4cc..0a273211fec28383eb85311acbf811a7b10f0623 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1048,7 +1048,7 @@ struct block_device *bdget_disk(struct gendisk *disk, int partno)
 
        part = disk_get_part(disk, partno);
        if (part)
-               bdev = bdget(part_devt(part));
+               bdev = bdget_part(part);
        disk_put_part(part);
 
        return bdev;

diff --git a/block/partitions/core.c b/block/partitions/core.c
index dd6811422a87af009636c19249e357395530f160..5309e0f44ba35287ae53343d8733eba773c47ce9 100644 (file)
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -580,7 +580,7 @@ int bdev_resize_partition(struct block_device *bdev, int partno,
                return -ENXIO;
 
        ret = -ENOMEM;
-       bdevp = bdget(part_devt(part));
+       bdevp = bdget_part(part);
        if (!bdevp)
                goto out_put_part;
 

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 6b9d19ffa5af7bc437e1a9dc0d00453ef8c4e53f..9e84b1928b9401d0eee5057e5c09e72473e649d0 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -891,7 +891,7 @@ static int bdev_set(struct inode *inode, void *data)
        return 0;
 }
 
-struct block_device *bdget(dev_t dev)
+static struct block_device *bdget(dev_t dev)
 {
        struct block_device *bdev;
        struct inode *inode;
@@ -920,8 +920,6 @@ struct block_device *bdget(dev_t dev)
        return bdev;
 }
 
-EXPORT_SYMBOL(bdget);
-
 /**
  * bdgrab -- Grab a reference to an already referenced block device
  * @bdev:      Block device to grab a reference to.
@@ -933,6 +931,11 @@ struct block_device *bdgrab(struct block_device *bdev)
 }
 EXPORT_SYMBOL(bdgrab);
 
+struct block_device *bdget_part(struct hd_struct *part)
+{
+       return bdget(part_devt(part));
+}
+
 long nr_blockdev_pages(void)
 {
        struct inode *inode;

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d5a3e1a4c2f79b3262901c13dcfd840a21343dfc..cf80e61b4c5e1a55a3c738fc7d5652fdd93727ee 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -2003,7 +2003,7 @@ void bd_abort_claiming(struct block_device *bdev, struct block_device *whole,
 void blkdev_put(struct block_device *bdev, fmode_t mode);
 
 struct block_device *I_BDEV(struct inode *inode);
-struct block_device *bdget(dev_t);
+struct block_device *bdget_part(struct hd_struct *part);
 struct block_device *bdgrab(struct block_device *bdev);
 void bdput(struct block_device *);
 

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index ec874ea040922a48317ff588c61f4cab818e17df..f1022945e3460b0bab7dfad8e2cba4333ffb7bc5 100644 (file)
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1827,13 +1827,11 @@ static ssize_t sysfs_blk_trace_attr_show(struct device *dev,
                                         struct device_attribute *attr,
                                         char *buf)
 {
-       struct hd_struct *p = dev_to_part(dev);
+       struct block_device *bdev = bdget_part(dev_to_part(dev));
        struct request_queue *q;
-       struct block_device *bdev;
        struct blk_trace *bt;
        ssize_t ret = -ENXIO;
 
-       bdev = bdget(part_devt(p));
        if (bdev == NULL)
                goto out;
 
@@ -1875,7 +1873,6 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev,
 {
        struct block_device *bdev;
        struct request_queue *q;
-       struct hd_struct *p;
        struct blk_trace *bt;
        u64 value;
        ssize_t ret = -EINVAL;
@@ -1895,9 +1892,7 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev,
                goto out;
 
        ret = -ENXIO;
-
-       p = dev_to_part(dev);
-       bdev = bdget(part_devt(p));
+       bdev = bdget_part(dev_to_part(dev));
        if (bdev == NULL)
                goto out;