block: remove ->bd_contains

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

diff --git a/fs/block_dev.c b/fs/block_dev.c
index b350ed3..94baee3 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -119,7 +119,7 @@ int truncate_bdev_range(struct block_device *bdev, fmode_t mode,
         * under live filesystem.
         */
        if (!(mode & FMODE_EXCL)) {
-               claimed_bdev = bdev->bd_contains;
+               claimed_bdev = bdev_whole(bdev);
                err = bd_prepare_to_claim(bdev, claimed_bdev,
                                          truncate_bdev_range);
                if (err)
@@ -880,7 +880,6 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno)
        spin_lock_init(&bdev->bd_size_lock);
        bdev->bd_disk = disk;
        bdev->bd_partno = partno;
-       bdev->bd_contains = NULL;
        bdev->bd_super = NULL;
        bdev->bd_inode = inode;
        bdev->bd_part_count = 0;
@@ -1347,9 +1346,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode)
        int ret;
 
        if (!bdev->bd_openers) {
-               bdev->bd_contains = bdev;
-
-               if (!bdev->bd_partno) {
+               if (!bdev_is_partition(bdev)) {
                        ret = -ENXIO;
                        bdev->bd_part = disk_get_part(disk, 0);
                        if (!bdev->bd_part)
@@ -1389,7 +1386,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode)
                        whole->bd_part_count++;
                        mutex_unlock(&whole->bd_mutex);
 
-                       bdev->bd_contains = whole;
                        bdev->bd_part = disk_get_part(disk, bdev->bd_partno);
                        if (!(disk->flags & GENHD_FL_UP) ||
                            !bdev->bd_part || !bdev->bd_part->nr_sects) {
@@ -1405,7 +1401,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode)
                if (bdev->bd_bdi == &noop_backing_dev_info)
                        bdev->bd_bdi = bdi_get(disk->queue->backing_dev_info);
        } else {
-               if (bdev->bd_contains == bdev) {
+               if (!bdev_is_partition(bdev)) {
                        ret = 0;
                        if (bdev->bd_disk->fops->open)
                                ret = bdev->bd_disk->fops->open(bdev, mode);
@@ -1423,7 +1419,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode)
  out_clear:
        disk_put_part(bdev->bd_part);
        bdev->bd_part = NULL;
-       bdev->bd_contains = NULL;
        return ret;
 }
 
@@ -1670,8 +1665,7 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
                disk_put_part(bdev->bd_part);
                bdev->bd_part = NULL;
                if (bdev_is_partition(bdev))
-                       victim = bdev->bd_contains;
-               bdev->bd_contains = NULL;
+                       victim = bdev_whole(bdev);
        } else {
                if (!bdev_is_partition(bdev) && disk->fops->release)
                        disk->fops->release(disk, mode);
@@ -1690,6 +1684,7 @@ void blkdev_put(struct block_device *bdev, fmode_t mode)
        mutex_lock(&bdev->bd_mutex);
 
        if (mode & FMODE_EXCL) {
+               struct block_device *whole = bdev_whole(bdev);
                bool bdev_free;
 
                /*
@@ -1700,13 +1695,12 @@ void blkdev_put(struct block_device *bdev, fmode_t mode)
                spin_lock(&bdev_lock);
 
                WARN_ON_ONCE(--bdev->bd_holders < 0);
-               WARN_ON_ONCE(--bdev->bd_contains->bd_holders < 0);
+               WARN_ON_ONCE(--whole->bd_holders < 0);
 
-               /* bd_contains might point to self, check in a separate step */
                if ((bdev_free = !bdev->bd_holders))
                        bdev->bd_holder = NULL;
-               if (!bdev->bd_contains->bd_holders)
-                       bdev->bd_contains->bd_holder = NULL;
+               if (!whole->bd_holders)
+                       whole->bd_holder = NULL;
 
                spin_unlock(&bdev_lock);