diff options
| author |   Alex Elder <elder@inktank.com> | 2012-08-10 13:12:07 -0700 |
|---|---|---|
| committer |   Sage Weil <sage@inktank.com> | 2012-09-21 20:48:54 -0700 |
| commit | 340c7a2b2c9a2da640af28a8c196356484ac8b50 (patch) | |
| tree | 4bd52ff7fc913c1b9bcb35e13c4df3edbb8067df /drivers | |
| parent | Linux 3.6-rc6 (diff) | |
| download | linux-dev-340c7a2b2c9a2da640af28a8c196356484ac8b50.tar.xz linux-dev-340c7a2b2c9a2da640af28a8c196356484ac8b50.zip | |
rbd: drop dev reference on error in rbd_open()
If a read-only rbd device is opened for writing in rbd_open(), it
returns without dropping the just-acquired device reference.
Fix this by moving the read-only check before getting the reference.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 9917943a3572..54a55f03115d 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -246,13 +246,12 @@ static int rbd_open(struct block_device *bdev, fmode_t mode) { struct rbd_device *rbd_dev = bdev->bd_disk->private_data; - rbd_get_dev(rbd_dev); - - set_device_ro(bdev, rbd_dev->read_only); - if ((mode & FMODE_WRITE) && rbd_dev->read_only) return -EROFS; + rbd_get_dev(rbd_dev); + set_device_ro(bdev, rbd_dev->read_only); + return 0; } |