block: remove i_bdev

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

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index c4f9ccf..45b0423 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -296,40 +296,32 @@ static void nbd_size_clear(struct nbd_device *nbd)
        }
 }
 
-static void nbd_size_update(struct nbd_device *nbd, bool start)
+static int nbd_set_size(struct nbd_device *nbd, loff_t bytesize,
+               loff_t blksize)
 {
-       struct nbd_config *config = nbd->config;
-       struct block_device *bdev = bdget_disk(nbd->disk, 0);
-       sector_t nr_sectors = config->bytesize >> 9;
+       if (!blksize)
+               blksize = NBD_DEF_BLKSIZE;
+       if (blksize < 512 || blksize > PAGE_SIZE || !is_power_of_2(blksize))
+               return -EINVAL;
+
+       nbd->config->bytesize = bytesize;
+       nbd->config->blksize = blksize;
 
-       if (config->flags & NBD_FLAG_SEND_TRIM) {
-               nbd->disk->queue->limits.discard_granularity = config->blksize;
-               nbd->disk->queue->limits.discard_alignment = config->blksize;
+       if (!nbd->task_recv)
+               return 0;
+
+       if (nbd->config->flags & NBD_FLAG_SEND_TRIM) {
+               nbd->disk->queue->limits.discard_granularity = blksize;
+               nbd->disk->queue->limits.discard_alignment = blksize;
                blk_queue_max_discard_sectors(nbd->disk->queue, UINT_MAX);
        }
-       blk_queue_logical_block_size(nbd->disk->queue, config->blksize);
-       blk_queue_physical_block_size(nbd->disk->queue, config->blksize);
-       set_capacity(nbd->disk, nr_sectors);
-       if (bdev) {
-               if (bdev->bd_disk) {
-                       bd_set_nr_sectors(bdev, nr_sectors);
-                       if (start)
-                               set_blocksize(bdev, config->blksize);
-               } else
-                       set_bit(GD_NEED_PART_SCAN, &nbd->disk->state);
-               bdput(bdev);
-       }
-       kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
-}
+       blk_queue_logical_block_size(nbd->disk->queue, blksize);
+       blk_queue_physical_block_size(nbd->disk->queue, blksize);
 
-static void nbd_size_set(struct nbd_device *nbd, loff_t blocksize,
-                        loff_t nr_blocks)
-{
-       struct nbd_config *config = nbd->config;
-       config->blksize = blocksize;
-       config->bytesize = blocksize * nr_blocks;
-       if (nbd->task_recv != NULL)
-               nbd_size_update(nbd, false);
+       set_bit(GD_NEED_PART_SCAN, &nbd->disk->state);
+       if (!set_capacity_and_notify(nbd->disk, bytesize >> 9))
+               kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
+       return 0;
 }
 
 static void nbd_complete_rq(struct request *req)
@@ -1309,8 +1301,7 @@ static int nbd_start_device(struct nbd_device *nbd)
                args->index = i;
                queue_work(nbd->recv_workq, &args->work);
        }
-       nbd_size_update(nbd, true);
-       return error;
+       return nbd_set_size(nbd, config->bytesize, config->blksize);
 }
 
 static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *bdev)
@@ -1352,14 +1343,6 @@ static void nbd_clear_sock_ioctl(struct nbd_device *nbd,
                nbd_config_put(nbd);
 }
 
-static bool nbd_is_valid_blksize(unsigned long blksize)
-{
-       if (!blksize || !is_power_of_2(blksize) || blksize < 512 ||
-           blksize > PAGE_SIZE)
-               return false;
-       return true;
-}
-
 static void nbd_set_cmd_timeout(struct nbd_device *nbd, u64 timeout)
 {
        nbd->tag_set.timeout = timeout * HZ;
@@ -1384,20 +1367,12 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
        case NBD_SET_SOCK:
                return nbd_add_socket(nbd, arg, false);
        case NBD_SET_BLKSIZE:
-               if (!arg)
-                       arg = NBD_DEF_BLKSIZE;
-               if (!nbd_is_valid_blksize(arg))
-                       return -EINVAL;
-               nbd_size_set(nbd, arg,
-                            div_s64(config->bytesize, arg));
-               return 0;
+               return nbd_set_size(nbd, config->bytesize, arg);
        case NBD_SET_SIZE:
-               nbd_size_set(nbd, config->blksize,
-                            div_s64(arg, config->blksize));
-               return 0;
+               return nbd_set_size(nbd, arg, config->blksize);
        case NBD_SET_SIZE_BLOCKS:
-               nbd_size_set(nbd, config->blksize, arg);
-               return 0;
+               return nbd_set_size(nbd, arg * config->blksize,
+                                   config->blksize);
        case NBD_SET_TIMEOUT:
                nbd_set_cmd_timeout(nbd, arg);
                return 0;
@@ -1518,6 +1493,7 @@ static void nbd_release(struct gendisk *disk, fmode_t mode)
        if (test_bit(NBD_RT_DISCONNECT_ON_CLOSE, &nbd->config->runtime_flags) &&
                        bdev->bd_openers == 0)
                nbd_disconnect_and_put(nbd);
+       bdput(bdev);
 
        nbd_config_put(nbd);
        nbd_put(nbd);
@@ -1814,18 +1790,11 @@ static int nbd_genl_size_set(struct genl_info *info, struct nbd_device *nbd)
        if (info->attrs[NBD_ATTR_SIZE_BYTES])
                bytes = nla_get_u64(info->attrs[NBD_ATTR_SIZE_BYTES]);
 
-       if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) {
+       if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES])
                bsize = nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]);
-               if (!bsize)
-                       bsize = NBD_DEF_BLKSIZE;
-               if (!nbd_is_valid_blksize(bsize)) {
-                       printk(KERN_ERR "Invalid block size %llu\n", bsize);
-                       return -EINVAL;
-               }
-       }
 
        if (bytes != config->bytesize || bsize != config->blksize)
-               nbd_size_set(nbd, bsize, div64_u64(bytes, bsize));
+               return nbd_set_size(nbd, bytes, bsize);
        return 0;
 }