All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Martin K . Petersen" <martin.petersen@oracle.com>,
	Oleksii Kurochko <olkuroch@cisco.com>,
	Sagi Grimberg <sagi@grimberg.me>,
	Mike Snitzer <snitzer@redhat.com>,
	Ilya Dryomov <idryomov@gmail.com>,
	Dongsheng Yang <dongsheng.yang@easystack.cn>,
	ceph-devel@vger.kernel.org, dm-devel@redhat.com,
	linux-block@vger.kernel.org, linux-nvme@lists.infradead.org
Subject: [PATCH 2/6] block: remove the NULL bdev check in bdev_read_only
Date: Mon,  7 Dec 2020 14:19:14 +0100	[thread overview]
Message-ID: <20201207131918.2252553-3-hch@lst.de> (raw)
In-Reply-To: <20201207131918.2252553-1-hch@lst.de>

Only a single caller can end up in bdev_read_only, so move the check there.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/genhd.c | 3 ---
 fs/super.c    | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 09ff6cef028729..c87013879b8650 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1445,11 +1445,8 @@ EXPORT_SYMBOL(set_disk_ro);
 
 int bdev_read_only(struct block_device *bdev)
 {
-	if (!bdev)
-		return 0;
 	return bdev->bd_read_only;
 }
-
 EXPORT_SYMBOL(bdev_read_only);
 
 /*
diff --git a/fs/super.c b/fs/super.c
index 2c6cdea2ab2d9e..5a1f384ffc74f6 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -865,7 +865,8 @@ int reconfigure_super(struct fs_context *fc)
 
 	if (fc->sb_flags_mask & SB_RDONLY) {
 #ifdef CONFIG_BLOCK
-		if (!(fc->sb_flags & SB_RDONLY) && bdev_read_only(sb->s_bdev))
+		if (!(fc->sb_flags & SB_RDONLY) && sb->s_bdev &&
+		    bdev_read_only(sb->s_bdev))
 			return -EACCES;
 #endif
 
-- 
2.29.2


WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Sagi Grimberg <sagi@grimberg.me>,
	Mike Snitzer <snitzer@redhat.com>,
	Oleksii Kurochko <olkuroch@cisco.com>,
	Dongsheng Yang <dongsheng.yang@easystack.cn>,
	linux-block@vger.kernel.org, dm-devel@redhat.com,
	linux-nvme@lists.infradead.org,
	"Martin K . Petersen" <martin.petersen@oracle.com>,
	Ilya Dryomov <idryomov@gmail.com>,
	ceph-devel@vger.kernel.org
Subject: [PATCH 2/6] block: remove the NULL bdev check in bdev_read_only
Date: Mon,  7 Dec 2020 14:19:14 +0100	[thread overview]
Message-ID: <20201207131918.2252553-3-hch@lst.de> (raw)
In-Reply-To: <20201207131918.2252553-1-hch@lst.de>

Only a single caller can end up in bdev_read_only, so move the check there.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/genhd.c | 3 ---
 fs/super.c    | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 09ff6cef028729..c87013879b8650 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1445,11 +1445,8 @@ EXPORT_SYMBOL(set_disk_ro);
 
 int bdev_read_only(struct block_device *bdev)
 {
-	if (!bdev)
-		return 0;
 	return bdev->bd_read_only;
 }
-
 EXPORT_SYMBOL(bdev_read_only);
 
 /*
diff --git a/fs/super.c b/fs/super.c
index 2c6cdea2ab2d9e..5a1f384ffc74f6 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -865,7 +865,8 @@ int reconfigure_super(struct fs_context *fc)
 
 	if (fc->sb_flags_mask & SB_RDONLY) {
 #ifdef CONFIG_BLOCK
-		if (!(fc->sb_flags & SB_RDONLY) && bdev_read_only(sb->s_bdev))
+		if (!(fc->sb_flags & SB_RDONLY) && sb->s_bdev &&
+		    bdev_read_only(sb->s_bdev))
 			return -EACCES;
 #endif
 
-- 
2.29.2


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Sagi Grimberg <sagi@grimberg.me>,
	Mike Snitzer <snitzer@redhat.com>,
	Oleksii Kurochko <olkuroch@cisco.com>,
	Dongsheng Yang <dongsheng.yang@easystack.cn>,
	linux-block@vger.kernel.org, dm-devel@redhat.com,
	linux-nvme@lists.infradead.org,
	"Martin K . Petersen" <martin.petersen@oracle.com>,
	Ilya Dryomov <idryomov@gmail.com>,
	ceph-devel@vger.kernel.org
Subject: [dm-devel] [PATCH 2/6] block: remove the NULL bdev check in bdev_read_only
Date: Mon,  7 Dec 2020 14:19:14 +0100	[thread overview]
Message-ID: <20201207131918.2252553-3-hch@lst.de> (raw)
In-Reply-To: <20201207131918.2252553-1-hch@lst.de>

Only a single caller can end up in bdev_read_only, so move the check there.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/genhd.c | 3 ---
 fs/super.c    | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 09ff6cef028729..c87013879b8650 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1445,11 +1445,8 @@ EXPORT_SYMBOL(set_disk_ro);
 
 int bdev_read_only(struct block_device *bdev)
 {
-	if (!bdev)
-		return 0;
 	return bdev->bd_read_only;
 }
-
 EXPORT_SYMBOL(bdev_read_only);
 
 /*
diff --git a/fs/super.c b/fs/super.c
index 2c6cdea2ab2d9e..5a1f384ffc74f6 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -865,7 +865,8 @@ int reconfigure_super(struct fs_context *fc)
 
 	if (fc->sb_flags_mask & SB_RDONLY) {
 #ifdef CONFIG_BLOCK
-		if (!(fc->sb_flags & SB_RDONLY) && bdev_read_only(sb->s_bdev))
+		if (!(fc->sb_flags & SB_RDONLY) && sb->s_bdev &&
+		    bdev_read_only(sb->s_bdev))
 			return -EACCES;
 #endif
 
-- 
2.29.2

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel


  parent reply	other threads:[~2020-12-07 13:23 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-07 13:19 split hard read-only vs read-only policy v2 Christoph Hellwig
2020-12-07 13:19 ` [dm-devel] " Christoph Hellwig
2020-12-07 13:19 ` Christoph Hellwig
2020-12-07 13:19 ` [PATCH 1/6] dm: use bdev_read_only to check if a device is read-only Christoph Hellwig
2020-12-07 13:19   ` [dm-devel] " Christoph Hellwig
2020-12-07 13:19   ` Christoph Hellwig
2020-12-08  5:23   ` Martin K. Petersen
2020-12-08  5:23     ` [dm-devel] " Martin K. Petersen
2020-12-08  5:23     ` Martin K. Petersen
2020-12-08  9:59   ` Ming Lei
2020-12-08  9:59     ` [dm-devel] " Ming Lei
2020-12-08  9:59     ` Ming Lei
2020-12-07 13:19 ` Christoph Hellwig [this message]
2020-12-07 13:19   ` [dm-devel] [PATCH 2/6] block: remove the NULL bdev check in bdev_read_only Christoph Hellwig
2020-12-07 13:19   ` Christoph Hellwig
2020-12-08  5:23   ` Martin K. Petersen
2020-12-08  5:23     ` [dm-devel] " Martin K. Petersen
2020-12-08  5:23     ` Martin K. Petersen
2020-12-08 10:06   ` Ming Lei
2020-12-08 10:06     ` [dm-devel] " Ming Lei
2020-12-08 10:06     ` Ming Lei
2020-12-07 13:19 ` [PATCH 3/6] block: add a hard-readonly flag to struct gendisk Christoph Hellwig
2020-12-07 13:19   ` [dm-devel] " Christoph Hellwig
2020-12-07 13:19   ` Christoph Hellwig
2020-12-08  5:24   ` Martin K. Petersen
2020-12-08  5:24     ` [dm-devel] " Martin K. Petersen
2020-12-08  5:24     ` Martin K. Petersen
2020-12-08  5:28   ` Martin K. Petersen
2020-12-08  5:28     ` [dm-devel] " Martin K. Petersen
2020-12-08  5:28     ` Martin K. Petersen
2020-12-08 10:22   ` Ming Lei
2020-12-08 10:22     ` [dm-devel] " Ming Lei
2020-12-08 10:22     ` Ming Lei
2020-12-08 10:57     ` Christoph Hellwig
2020-12-08 10:57       ` [dm-devel] " Christoph Hellwig
2020-12-08 10:57       ` Christoph Hellwig
2020-12-07 13:19 ` [PATCH 4/6] block: propagate BLKROSET on the whole device to all partitions Christoph Hellwig
2020-12-07 13:19   ` [dm-devel] " Christoph Hellwig
2020-12-07 13:19   ` Christoph Hellwig
2020-12-08  5:27   ` Martin K. Petersen
2020-12-08  5:27     ` [dm-devel] " Martin K. Petersen
2020-12-08  5:27     ` Martin K. Petersen
2020-12-08  9:25     ` Christoph Hellwig
2020-12-08  9:25       ` [dm-devel] " Christoph Hellwig
2020-12-08  9:25       ` Christoph Hellwig
2020-12-08 12:41       ` Johannes Thumshirn
2020-12-08 12:41         ` [dm-devel] " Johannes Thumshirn
2020-12-08 12:41         ` Johannes Thumshirn
2020-12-08 10:29   ` Ming Lei
2020-12-08 10:29     ` [dm-devel] " Ming Lei
2020-12-08 10:29     ` Ming Lei
2020-12-08 10:59     ` Christoph Hellwig
2020-12-08 10:59       ` [dm-devel] " Christoph Hellwig
2020-12-08 10:59       ` Christoph Hellwig
2020-12-09  1:23       ` Ming Lei
2020-12-09  1:23         ` [dm-devel] " Ming Lei
2020-12-09  1:23         ` Ming Lei
2020-12-07 13:19 ` [PATCH 5/6] rbd: remove the ->set_read_only method Christoph Hellwig
2020-12-07 13:19   ` [dm-devel] " Christoph Hellwig
2020-12-07 13:19   ` Christoph Hellwig
2020-12-07 14:57   ` Ilya Dryomov
2020-12-07 14:57     ` [dm-devel] " Ilya Dryomov
2020-12-07 14:57     ` Ilya Dryomov
2020-12-08  5:30   ` Martin K. Petersen
2020-12-08  5:30     ` [dm-devel] " Martin K. Petersen
2020-12-08  5:30     ` Martin K. Petersen
2020-12-07 13:19 ` [PATCH 6/6] nvme: allow revalidate to set a namespace read-only Christoph Hellwig
2020-12-07 13:19   ` [dm-devel] " Christoph Hellwig
2020-12-07 13:19   ` Christoph Hellwig
2020-12-07 18:13   ` Keith Busch
2020-12-07 18:13     ` [dm-devel] " Keith Busch
2020-12-07 18:13     ` Keith Busch
2020-12-08  5:29   ` Martin K. Petersen
2020-12-08  5:29     ` [dm-devel] " Martin K. Petersen
2020-12-08  5:29     ` Martin K. Petersen
2020-12-10  7:50 ` split hard read-only vs read-only policy v2 Christoph Hellwig
2020-12-10  7:50   ` [dm-devel] " Christoph Hellwig
2020-12-10  7:50   ` Christoph Hellwig
2020-12-08 16:28 split hard read-only vs read-only policy v3 Christoph Hellwig
2020-12-08 16:28 ` [PATCH 2/6] block: remove the NULL bdev check in bdev_read_only Christoph Hellwig
2020-12-08 16:28   ` Christoph Hellwig
2020-12-08 16:45   ` Hannes Reinecke
2020-12-08 16:45     ` Hannes Reinecke
2021-01-09 10:42 split hard read-only vs read-only policy v3 (resend) Christoph Hellwig
2021-01-09 10:42 ` [PATCH 2/6] block: remove the NULL bdev check in bdev_read_only Christoph Hellwig
2021-01-09 10:42   ` Christoph Hellwig
2021-01-09 20:14   ` Chaitanya Kulkarni
2021-01-09 20:14     ` Chaitanya Kulkarni
2021-01-10 14:59   ` Hannes Reinecke
2021-01-10 14:59     ` Hannes Reinecke

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=20201207131918.2252553-3-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=ceph-devel@vger.kernel.org \
    --cc=dm-devel@redhat.com \
    --cc=dongsheng.yang@easystack.cn \
    --cc=idryomov@gmail.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=martin.petersen@oracle.com \
    --cc=olkuroch@cisco.com \
    --cc=sagi@grimberg.me \
    --cc=snitzer@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.