Merge tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[cascardo/linux.git] / drivers / block / virtio_blk.c

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 655e570..5ea2f0b 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -342,7 +342,7 @@ static void virtblk_config_changed_work(struct work_struct *work)
        struct request_queue *q = vblk->disk->queue;
        char cap_str_2[10], cap_str_10[10];
        char *envp[] = { "RESIZE=1", NULL };
-       u64 capacity, size;
+       u64 capacity;
 
        /* Host must always specify the capacity. */
        virtio_cread(vdev, struct virtio_blk_config, capacity, &capacity);
@@ -354,9 +354,10 @@ static void virtblk_config_changed_work(struct work_struct *work)
                capacity = (sector_t)-1;
        }
 
-       size = capacity * queue_logical_block_size(q);
-       string_get_size(size, STRING_UNITS_2, cap_str_2, sizeof(cap_str_2));
-       string_get_size(size, STRING_UNITS_10, cap_str_10, sizeof(cap_str_10));
+       string_get_size(capacity, queue_logical_block_size(q),
+                       STRING_UNITS_2, cap_str_2, sizeof(cap_str_2));
+       string_get_size(capacity, queue_logical_block_size(q),
+                       STRING_UNITS_10, cap_str_10, sizeof(cap_str_10));
 
        dev_notice(&vdev->dev,
                  "new size: %llu %d-byte logical blocks (%s/%s)\n",