block: remove i_bdev

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

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index f84128a..2ed79b0 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -692,12 +692,9 @@ static void rbd_release(struct gendisk *disk, fmode_t mode)
        put_device(&rbd_dev->dev);
 }
 
-static int rbd_ioctl_set_ro(struct rbd_device *rbd_dev, unsigned long arg)
+static int rbd_set_read_only(struct block_device *bdev, bool ro)
 {
-       int ro;
-
-       if (get_user(ro, (int __user *)arg))
-               return -EFAULT;
+       struct rbd_device *rbd_dev = bdev->bd_disk->private_data;
 
        /*
         * Both images mapped read-only and snapshots can't be marked
@@ -710,43 +707,14 @@ static int rbd_ioctl_set_ro(struct rbd_device *rbd_dev, unsigned long arg)
                rbd_assert(!rbd_is_snap(rbd_dev));
        }
 
-       /* Let blkdev_roset() handle it */
-       return -ENOTTY;
-}
-
-static int rbd_ioctl(struct block_device *bdev, fmode_t mode,
-                       unsigned int cmd, unsigned long arg)
-{
-       struct rbd_device *rbd_dev = bdev->bd_disk->private_data;
-       int ret;
-
-       switch (cmd) {
-       case BLKROSET:
-               ret = rbd_ioctl_set_ro(rbd_dev, arg);
-               break;
-       default:
-               ret = -ENOTTY;
-       }
-
-       return ret;
-}
-
-#ifdef CONFIG_COMPAT
-static int rbd_compat_ioctl(struct block_device *bdev, fmode_t mode,
-                               unsigned int cmd, unsigned long arg)
-{
-       return rbd_ioctl(bdev, mode, cmd, arg);
+       return 0;
 }
-#endif /* CONFIG_COMPAT */
 
 static const struct block_device_operations rbd_bd_ops = {
        .owner                  = THIS_MODULE,
        .open                   = rbd_open,
        .release                = rbd_release,
-       .ioctl                  = rbd_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl           = rbd_compat_ioctl,
-#endif
+       .set_read_only          = rbd_set_read_only,
 };
 
 /*
@@ -4920,8 +4888,7 @@ static void rbd_dev_update_size(struct rbd_device *rbd_dev)
            !test_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags)) {
                size = (sector_t)rbd_dev->mapping.size / SECTOR_SIZE;
                dout("setting size to %llu sectors", (unsigned long long)size);
-               set_capacity(rbd_dev->disk, size);
-               revalidate_disk_size(rbd_dev->disk, true);
+               set_capacity_and_notify(rbd_dev->disk, size);
        }
 }