Merge tag 'for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux-2.6-microblaze.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 61cf33b..9e56ee1 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -39,7 +39,6 @@
 
 struct bdev_inode {
        struct block_device bdev;
-       struct hd_struct hd;
        struct inode vfs_inode;
 };
 
@@ -887,9 +886,6 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno)
                iput(inode);
                return NULL;
        }
-       bdev->bd_part = &BDEV_I(inode)->hd;
-       memset(bdev->bd_part, 0, sizeof(*bdev->bd_part));
-       bdev->bd_part->bdev = bdev;
        return bdev;
 }
 
@@ -926,11 +922,6 @@ 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;
@@ -1308,7 +1299,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode)
                        if (ret)
                                return ret;
                } else {
-                       struct block_device *whole = bdget_disk(disk, 0);
+                       struct block_device *whole = bdgrab(disk->part0);
 
                        mutex_lock_nested(&whole->bd_mutex, 1);
                        ret = __blkdev_get(whole, mode);