rbd: fix and simplify rbd_ioctl_set_ro()
->open_count/-EBUSY check is bogus and wrong: when an open device is set read-only, blkdev_write_iter() refuses further writes with -EPERM. This is standard behaviour and all other block devices allow this. set_disk_ro() call is also problematic: we affect the entire device when called on a single partition. All rbd_ioctl_set_ro() needs to do is refuse ro -> rw transition for mapped snapshots. Everything else can be handled by generic code. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
@ -640,46 +640,24 @@ static void rbd_release(struct gendisk *disk, fmode_t mode)
|
|||||||
|
|
||||||
static int rbd_ioctl_set_ro(struct rbd_device *rbd_dev, unsigned long arg)
|
static int rbd_ioctl_set_ro(struct rbd_device *rbd_dev, unsigned long arg)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ro;
|
||||||
int val;
|
|
||||||
bool ro;
|
|
||||||
bool ro_changed = false;
|
|
||||||
|
|
||||||
/* get_user() may sleep, so call it before taking rbd_dev->lock */
|
if (get_user(ro, (int __user *)arg))
|
||||||
if (get_user(val, (int __user *)(arg)))
|
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
|
||||||
ro = val ? true : false;
|
/* Snapshots can't be marked read-write */
|
||||||
/* Snapshot doesn't allow to write*/
|
|
||||||
if (rbd_dev->spec->snap_id != CEPH_NOSNAP && !ro)
|
if (rbd_dev->spec->snap_id != CEPH_NOSNAP && !ro)
|
||||||
return -EROFS;
|
return -EROFS;
|
||||||
|
|
||||||
spin_lock_irq(&rbd_dev->lock);
|
/* Let blkdev_roset() handle it */
|
||||||
/* prevent others open this device */
|
return -ENOTTY;
|
||||||
if (rbd_dev->open_count > 1) {
|
|
||||||
ret = -EBUSY;
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rbd_dev->mapping.read_only != ro) {
|
|
||||||
rbd_dev->mapping.read_only = ro;
|
|
||||||
ro_changed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
out:
|
|
||||||
spin_unlock_irq(&rbd_dev->lock);
|
|
||||||
/* set_disk_ro() may sleep, so call it after releasing rbd_dev->lock */
|
|
||||||
if (ret == 0 && ro_changed)
|
|
||||||
set_disk_ro(rbd_dev->disk, ro ? 1 : 0);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rbd_ioctl(struct block_device *bdev, fmode_t mode,
|
static int rbd_ioctl(struct block_device *bdev, fmode_t mode,
|
||||||
unsigned int cmd, unsigned long arg)
|
unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
struct rbd_device *rbd_dev = bdev->bd_disk->private_data;
|
struct rbd_device *rbd_dev = bdev->bd_disk->private_data;
|
||||||
int ret = 0;
|
int ret;
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case BLKROSET:
|
case BLKROSET:
|
||||||
|
Reference in New Issue
Block a user