iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: remove the NULL bdev check in bdev_read_only

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2021-01-09 11:42:50 +01:00 committed by Jens Axboe
parent 1e0dcca9e1
commit 6f0d9689b6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/genhd.c
View File

@ -1657,11 +1657,8 @@ EXPORT_SYMBOL(set_disk_ro);
int bdev_read_only(struct block_device *bdev) int bdev_read_only(struct block_device *bdev)
{ {
if (!bdev)
return 0;
return bdev->bd_read_only; return bdev->bd_read_only;
} }
EXPORT_SYMBOL(bdev_read_only); EXPORT_SYMBOL(bdev_read_only);
/* /*

3
fs/super.c
View File

@ -865,7 +865,8 @@ int reconfigure_super(struct fs_context *fc)
if (fc->sb_flags_mask & SB_RDONLY) { if (fc->sb_flags_mask & SB_RDONLY) {
#ifdef CONFIG_BLOCK #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; return -EACCES;
#endif #endif