diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-01-09 13:42:50 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-01-25 04:15:57 +0300 |
| commit | 6f0d9689b670bc9f9640ff87b3f9226b7806dea2 (patch) | |
| tree | 56428c55621af77d28f43ad7545416d6b2fb4218 | |
| parent | 1e0dcca9e1aa3caa1a0dc4300db1a091078fe40b (diff) | |
| download | linux-6f0d9689b670bc9f9640ff87b3f9226b7806dea2.tar.xz | |
block: remove the NULL bdev check in bdev_read_only
Only a single caller can end up in bdev_read_only, so move the check
there.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/genhd.c | 3 | ||||
| -rw-r--r-- | fs/super.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/block/genhd.c b/block/genhd.c index 419548e92d82..484a474648d5 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1657,11 +1657,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 2c6cdea2ab2d..5a1f384ffc74 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 |