|
@@ -60,19 +60,6 @@ static void bdev_write_inode(struct inode *inode)
|
|
|
spin_unlock(&inode->i_lock);
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * Move the inode from its current bdi to a new bdi. Make sure the inode
|
|
|
- * is clean before moving so that it doesn't linger on the old bdi.
|
|
|
- */
|
|
|
-static void bdev_inode_switch_bdi(struct inode *inode,
|
|
|
- struct backing_dev_info *dst)
|
|
|
-{
|
|
|
- spin_lock(&inode->i_lock);
|
|
|
- WARN_ON_ONCE(inode->i_state & I_DIRTY);
|
|
|
- inode->i_data.backing_dev_info = dst;
|
|
|
- spin_unlock(&inode->i_lock);
|
|
|
-}
|
|
|
-
|
|
|
/* Kill _all_ buffers and pagecache , dirty or not.. */
|
|
|
void kill_bdev(struct block_device *bdev)
|
|
|
{
|
|
@@ -589,7 +576,6 @@ struct block_device *bdget(dev_t dev)
|
|
|
inode->i_bdev = bdev;
|
|
|
inode->i_data.a_ops = &def_blk_aops;
|
|
|
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
|
|
|
- inode->i_data.backing_dev_info = &default_backing_dev_info;
|
|
|
spin_lock(&bdev_lock);
|
|
|
list_add(&bdev->bd_list, &all_bdevs);
|
|
|
spin_unlock(&bdev_lock);
|
|
@@ -1150,8 +1136,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
|
|
|
bdev->bd_queue = disk->queue;
|
|
|
bdev->bd_contains = bdev;
|
|
|
if (!partno) {
|
|
|
- struct backing_dev_info *bdi;
|
|
|
-
|
|
|
ret = -ENXIO;
|
|
|
bdev->bd_part = disk_get_part(disk, partno);
|
|
|
if (!bdev->bd_part)
|
|
@@ -1177,11 +1161,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (!ret) {
|
|
|
+ if (!ret)
|
|
|
bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
|
|
|
- bdi = blk_get_backing_dev_info(bdev);
|
|
|
- bdev_inode_switch_bdi(bdev->bd_inode, bdi);
|
|
|
- }
|
|
|
|
|
|
/*
|
|
|
* If the device is invalidated, rescan partition
|
|
@@ -1208,8 +1189,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
|
|
|
if (ret)
|
|
|
goto out_clear;
|
|
|
bdev->bd_contains = whole;
|
|
|
- bdev_inode_switch_bdi(bdev->bd_inode,
|
|
|
- whole->bd_inode->i_data.backing_dev_info);
|
|
|
bdev->bd_part = disk_get_part(disk, partno);
|
|
|
if (!(disk->flags & GENHD_FL_UP) ||
|
|
|
!bdev->bd_part || !bdev->bd_part->nr_sects) {
|
|
@@ -1249,7 +1228,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
|
|
|
bdev->bd_disk = NULL;
|
|
|
bdev->bd_part = NULL;
|
|
|
bdev->bd_queue = NULL;
|
|
|
- bdev_inode_switch_bdi(bdev->bd_inode, &default_backing_dev_info);
|
|
|
if (bdev != bdev->bd_contains)
|
|
|
__blkdev_put(bdev->bd_contains, mode, 1);
|
|
|
bdev->bd_contains = NULL;
|
|
@@ -1474,8 +1452,6 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
|
|
|
* dirty data before.
|
|
|
*/
|
|
|
bdev_write_inode(bdev->bd_inode);
|
|
|
- bdev_inode_switch_bdi(bdev->bd_inode,
|
|
|
- &default_backing_dev_info);
|
|
|
}
|
|
|
if (bdev->bd_contains == bdev) {
|
|
|
if (disk->fops->release)
|