From: Stefan Haberland <sth@linux.ibm.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Ilya Dryomov <idryomov@gmail.com>,
Song Liu <song@kernel.org>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>,
Jan Hoeppner <hoeppner@linux.ibm.com>,
linux-block@vger.kernel.org, ceph-devel@vger.kernel.org,
linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org,
linux-mtd@lists.infradead.org, linux-s390@vger.kernel.org
Subject: Re: [PATCH 06/10] dasd: implement ->set_read_only to hook into BLKROSET processing
Date: Thu, 5 Nov 2020 21:56:47 +0100 [thread overview]
Message-ID: <20201105205634.GA78869@imap.linux.ibm.com> (raw)
In-Reply-To: <20201103100018.683694-7-hch@lst.de>
Christoph Hellwig <hch@lst.de> schrieb am Tue, 03. Nov 11:00:
> Implement the ->set_read_only method instead of parsing the actual
> ioctl command.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/s390/block/dasd.c | 1 +
> drivers/s390/block/dasd_int.h | 3 ++-
> drivers/s390/block/dasd_ioctl.c | 27 +++++++++------------------
> 3 files changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
> index eb17fea8075c6f..db24e04ee9781e 100644
> --- a/drivers/s390/block/dasd.c
> +++ b/drivers/s390/block/dasd.c
> @@ -3394,6 +3394,7 @@ dasd_device_operations = {
> .ioctl = dasd_ioctl,
> .compat_ioctl = dasd_ioctl,
> .getgeo = dasd_getgeo,
> + .set_read_only = dasd_set_read_only,
> };
>
> /*******************************************************************************
> diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
> index fa552f9f166671..c59a0d63b506e6 100644
> --- a/drivers/s390/block/dasd_int.h
> +++ b/drivers/s390/block/dasd_int.h
> @@ -844,7 +844,8 @@ int dasd_scan_partitions(struct dasd_block *);
> void dasd_destroy_partitions(struct dasd_block *);
>
> /* externals in dasd_ioctl.c */
> -int dasd_ioctl(struct block_device *, fmode_t, unsigned int, unsigned long);
> +int dasd_ioctl(struct block_device *, fmode_t, unsigned int, unsigned long);
> +int dasd_set_read_only(struct block_device *bdev, bool ro);
>
> /* externals in dasd_proc.c */
> int dasd_proc_init(void);
> diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
> index cb6427fb9f3d16..3359559517bfcf 100644
> --- a/drivers/s390/block/dasd_ioctl.c
> +++ b/drivers/s390/block/dasd_ioctl.c
> @@ -532,28 +532,22 @@ static int dasd_ioctl_information(struct dasd_block *block, void __user *argp,
> /*
> * Set read only
> */
> -static int
> -dasd_ioctl_set_ro(struct block_device *bdev, void __user *argp)
> +int dasd_set_read_only(struct block_device *bdev, bool ro)
> {
> struct dasd_device *base;
> - int intval, rc;
> + int rc;
>
> - if (!capable(CAP_SYS_ADMIN))
> - return -EACCES;
> + /* do not manipulate hardware state for partitions */
> if (bdev_is_partition(bdev))
> - // ro setting is not allowed for partitions
> - return -EINVAL;
> - if (get_user(intval, (int __user *)argp))
> - return -EFAULT;
> + return 0;
> +
> base = dasd_device_from_gendisk(bdev->bd_disk);
> if (!base)
> return -ENODEV;
> - if (!intval && test_bit(DASD_FLAG_DEVICE_RO, &base->flags)) {
> - dasd_put_device(base);
> - return -EROFS;
> - }
> - set_disk_ro(bdev->bd_disk, intval);
While testing this patch I just noticed that when I set a device readonly this is
not going to be passed on to the partitions on this device any longer.
This is caused by the removed call to set_disk_ro().
Is this intentional or was this removed by accident?
> - rc = dasd_set_feature(base->cdev, DASD_FEATURE_READONLY, intval);
> + if (!ro && test_bit(DASD_FLAG_DEVICE_RO, &base->flags))
> + rc = -EROFS;
> + else
> + rc = dasd_set_feature(base->cdev, DASD_FEATURE_READONLY, ro);
> dasd_put_device(base);
> return rc;
> }
> @@ -633,9 +627,6 @@ int dasd_ioctl(struct block_device *bdev, fmode_t mode,
> case BIODASDPRRST:
> rc = dasd_ioctl_reset_profile(block);
> break;
> - case BLKROSET:
> - rc = dasd_ioctl_set_ro(bdev, argp);
> - break;
> case DASDAPIVER:
> rc = dasd_ioctl_api_version(argp);
> break;
> --
> 2.28.0
>
next prev parent reply other threads:[~2020-11-05 20:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 10:00 block ioctl cleanups v2 Christoph Hellwig
2020-11-03 10:00 ` [PATCH 01/10] mtd_blkdevs: don't override BLKFLSBUF Christoph Hellwig
2020-11-03 10:00 ` [PATCH 02/10] block: don't call into the driver for BLKFLSBUF Christoph Hellwig
2020-11-03 10:00 ` [PATCH 03/10] block: add a new set_read_only method Christoph Hellwig
2020-11-03 10:00 ` [PATCH 04/10] rbd: implement ->set_read_only to hook into BLKROSET processing Christoph Hellwig
2020-11-03 10:00 ` [PATCH 05/10] md: " Christoph Hellwig
2020-11-06 0:59 ` Song Liu
2020-11-03 10:00 ` [PATCH 06/10] dasd: " Christoph Hellwig
2020-11-05 20:56 ` Stefan Haberland [this message]
2020-11-06 14:02 ` Christoph Hellwig
2020-11-06 16:08 ` Stefan Haberland
2020-11-03 10:00 ` [PATCH 07/10] block: don't call into the driver for BLKROSET Christoph Hellwig
2020-11-03 10:00 ` [PATCH 08/10] loop: use set_disk_ro Christoph Hellwig
2020-11-03 10:00 ` [PATCH 09/10] block: remove set_device_ro Christoph Hellwig
2020-11-03 10:00 ` [PATCH 10/10] block: remove __blkdev_driver_ioctl Christoph Hellwig
2020-11-11 7:58 ` block ioctl cleanups v2 Christoph Hellwig
2020-11-11 16:13 ` Jens Axboe
2020-11-11 16:20 ` Christoph Hellwig
2020-11-11 16:23 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201105205634.GA78869@imap.linux.ibm.com \
--to=sth@linux.ibm.com \
--cc=axboe@kernel.dk \
--cc=ceph-devel@vger.kernel.org \
--cc=hch@lst.de \
--cc=hoeppner@linux.ibm.com \
--cc=idryomov@gmail.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=song@kernel.org \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).