提交 34919e3b 编写于 作者: C Christoph Hellwig 提交者: Jens Axboe

rbd: implement ->set_read_only to hook into BLKROSET processing

Implement the ->set_read_only method instead of parsing the actual
ioctl command.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Acked-by: NIlya Dryomov <idryomov@gmail.com>
Signed-off-by: NJens Axboe <axboe@kernel.dk>
上级 e00adcad
...@@ -692,12 +692,9 @@ static void rbd_release(struct gendisk *disk, fmode_t mode) ...@@ -692,12 +692,9 @@ static void rbd_release(struct gendisk *disk, fmode_t mode)
put_device(&rbd_dev->dev); put_device(&rbd_dev->dev);
} }
static int rbd_ioctl_set_ro(struct rbd_device *rbd_dev, unsigned long arg) static int rbd_set_read_only(struct block_device *bdev, bool ro)
{ {
int ro; struct rbd_device *rbd_dev = bdev->bd_disk->private_data;
if (get_user(ro, (int __user *)arg))
return -EFAULT;
/* /*
* Both images mapped read-only and snapshots can't be marked * Both images mapped read-only and snapshots can't be marked
...@@ -710,43 +707,14 @@ static int rbd_ioctl_set_ro(struct rbd_device *rbd_dev, unsigned long arg) ...@@ -710,43 +707,14 @@ static int rbd_ioctl_set_ro(struct rbd_device *rbd_dev, unsigned long arg)
rbd_assert(!rbd_is_snap(rbd_dev)); rbd_assert(!rbd_is_snap(rbd_dev));
} }
/* Let blkdev_roset() handle it */ return 0;
return -ENOTTY;
}
static int rbd_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
struct rbd_device *rbd_dev = bdev->bd_disk->private_data;
int ret;
switch (cmd) {
case BLKROSET:
ret = rbd_ioctl_set_ro(rbd_dev, arg);
break;
default:
ret = -ENOTTY;
}
return ret;
}
#ifdef CONFIG_COMPAT
static int rbd_compat_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
return rbd_ioctl(bdev, mode, cmd, arg);
} }
#endif /* CONFIG_COMPAT */
static const struct block_device_operations rbd_bd_ops = { static const struct block_device_operations rbd_bd_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = rbd_open, .open = rbd_open,
.release = rbd_release, .release = rbd_release,
.ioctl = rbd_ioctl, .set_read_only = rbd_set_read_only,
#ifdef CONFIG_COMPAT
.compat_ioctl = rbd_compat_ioctl,
#endif
}; };
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册