block: simplify the block device claiming interface

[linux-2.6-microblaze.git] / drivers / block / loop.c

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 9a27d4f..d643c67 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -675,10 +675,10 @@ static int loop_validate_file(struct file *file, struct block_device *bdev)
        while (is_loop_device(f)) {
                struct loop_device *l;
 
-               if (f->f_mapping->host->i_bdev == bdev)
+               if (f->f_mapping->host->i_rdev == bdev->bd_dev)
                        return -EBADF;
 
-               l = f->f_mapping->host->i_bdev->bd_disk->private_data;
+               l = I_BDEV(f->f_mapping->host)->bd_disk->private_data;
                if (l->lo_state != Lo_bound) {
                        return -EINVAL;
                }
@@ -885,9 +885,7 @@ static void loop_config_discard(struct loop_device *lo)
         * file-backed loop devices: discarded regions read back as zero.
         */
        if (S_ISBLK(inode->i_mode) && !lo->lo_encrypt_key_size) {
-               struct request_queue *backingq;
-
-               backingq = bdev_get_queue(inode->i_bdev);
+               struct request_queue *backingq = bdev_get_queue(I_BDEV(inode));
 
                max_discard_sectors = backingq->limits.max_write_zeroes_sectors;
                granularity = backingq->limits.discard_granularity ?:
@@ -1071,7 +1069,6 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
        struct file     *file;
        struct inode    *inode;
        struct address_space *mapping;
-       struct block_device *claimed_bdev = NULL;
        int             error;
        loff_t          size;
        bool            partscan;
@@ -1090,8 +1087,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
         * here to avoid changing device under exclusive owner.
         */
        if (!(mode & FMODE_EXCL)) {
-               claimed_bdev = bdev->bd_contains;
-               error = bd_prepare_to_claim(bdev, claimed_bdev, loop_configure);
+               error = bd_prepare_to_claim(bdev, loop_configure);
                if (error)
                        goto out_putf;
        }
@@ -1164,9 +1160,6 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
        size = get_loop_size(lo, file);
        loop_set_size(lo, size);
 
-       set_blocksize(bdev, S_ISBLK(inode->i_mode) ?
-                     block_size(inode->i_bdev) : PAGE_SIZE);
-
        lo->lo_state = Lo_bound;
        if (part_shift)
                lo->lo_flags |= LO_FLAGS_PARTSCAN;
@@ -1181,15 +1174,15 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
        mutex_unlock(&loop_ctl_mutex);
        if (partscan)
                loop_reread_partitions(lo, bdev);
-       if (claimed_bdev)
-               bd_abort_claiming(bdev, claimed_bdev, loop_configure);
+       if (!(mode & FMODE_EXCL))
+               bd_abort_claiming(bdev, loop_configure);
        return 0;
 
 out_unlock:
        mutex_unlock(&loop_ctl_mutex);
 out_bdev:
-       if (claimed_bdev)
-               bd_abort_claiming(bdev, claimed_bdev, loop_configure);
+       if (!(mode & FMODE_EXCL))
+               bd_abort_claiming(bdev, loop_configure);
 out_putf:
        fput(file);
 out: