Commit ee4bf648 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

nbd: remove the call to set_blocksize

Block driver have no business setting the file system concept of a
block size.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 449f4ec9
...@@ -296,7 +296,7 @@ static void nbd_size_clear(struct nbd_device *nbd) ...@@ -296,7 +296,7 @@ static void nbd_size_clear(struct nbd_device *nbd)
} }
} }
static void nbd_size_update(struct nbd_device *nbd, bool start) static void nbd_size_update(struct nbd_device *nbd)
{ {
struct nbd_config *config = nbd->config; struct nbd_config *config = nbd->config;
struct block_device *bdev = bdget_disk(nbd->disk, 0); struct block_device *bdev = bdget_disk(nbd->disk, 0);
...@@ -311,11 +311,9 @@ static void nbd_size_update(struct nbd_device *nbd, bool start) ...@@ -311,11 +311,9 @@ static void nbd_size_update(struct nbd_device *nbd, bool start)
blk_queue_physical_block_size(nbd->disk->queue, config->blksize); blk_queue_physical_block_size(nbd->disk->queue, config->blksize);
set_capacity(nbd->disk, nr_sectors); set_capacity(nbd->disk, nr_sectors);
if (bdev) { if (bdev) {
if (bdev->bd_disk) { if (bdev->bd_disk)
bd_set_nr_sectors(bdev, nr_sectors); bd_set_nr_sectors(bdev, nr_sectors);
if (start) else
set_blocksize(bdev, config->blksize);
} else
set_bit(GD_NEED_PART_SCAN, &nbd->disk->state); set_bit(GD_NEED_PART_SCAN, &nbd->disk->state);
bdput(bdev); bdput(bdev);
} }
...@@ -329,7 +327,7 @@ static void nbd_size_set(struct nbd_device *nbd, loff_t blocksize, ...@@ -329,7 +327,7 @@ static void nbd_size_set(struct nbd_device *nbd, loff_t blocksize,
config->blksize = blocksize; config->blksize = blocksize;
config->bytesize = blocksize * nr_blocks; config->bytesize = blocksize * nr_blocks;
if (nbd->task_recv != NULL) if (nbd->task_recv != NULL)
nbd_size_update(nbd, false); nbd_size_update(nbd);
} }
static void nbd_complete_rq(struct request *req) static void nbd_complete_rq(struct request *req)
...@@ -1309,7 +1307,7 @@ static int nbd_start_device(struct nbd_device *nbd) ...@@ -1309,7 +1307,7 @@ static int nbd_start_device(struct nbd_device *nbd)
args->index = i; args->index = i;
queue_work(nbd->recv_workq, &args->work); queue_work(nbd->recv_workq, &args->work);
} }
nbd_size_update(nbd, true); nbd_size_update(nbd);
return error; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment