summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2013-09-30 20:10:04 -0700
committerJosh Durgin <josh.durgin@inktank.com>2014-06-10 18:09:25 -0700
commit22001f619f29ddf66582d834223dcff4c0b74595 (patch)
tree67d9a9cdcb5c7f3fe45e1fab6393c130eb65857c /drivers/block
parent77f33c03739697d01c2e730e4c2610424059ceaf (diff)
downloadop-kernel-dev-22001f619f29ddf66582d834223dcff4c0b74595.zip
op-kernel-dev-22001f619f29ddf66582d834223dcff4c0b74595.tar.gz
rbd: only set disk to read-only once
rbd_open(), called every time the device is opened, calls set_device_ro(). There's no reason to set the device read-only or read-write every time it is opened. Just do this once during device setup, using set_disk_ro() instead because the struct block_device isn't available to us there. Signed-off-by: Josh Durgin <josh.durgin@inktank.com> Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 6423f6e..bbeb404 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -541,7 +541,6 @@ static int rbd_open(struct block_device *bdev, fmode_t mode)
return -ENOENT;
(void) get_device(&rbd_dev->dev);
- set_device_ro(bdev, rbd_dev->mapping.read_only);
return 0;
}
@@ -5060,6 +5059,7 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev)
if (ret)
goto err_out_disk;
set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);
+ set_disk_ro(rbd_dev->disk, rbd_dev->mapping.read_only);
ret = rbd_bus_add_dev(rbd_dev);
if (ret)
OpenPOWER on IntegriCloud