Skip to content

Commit 6f0d968

Browse files
Christoph Hellwigaxboe
authored andcommitted
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>
1 parent 1e0dcca commit 6f0d968

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

block/genhd.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,11 +1657,8 @@ EXPORT_SYMBOL(set_disk_ro);
16571657

16581658
int bdev_read_only(struct block_device *bdev)
16591659
{
1660-
if (!bdev)
1661-
return 0;
16621660
return bdev->bd_read_only;
16631661
}
1664-
16651662
EXPORT_SYMBOL(bdev_read_only);
16661663

16671664
/*

fs/super.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,8 @@ int reconfigure_super(struct fs_context *fc)
865865

866866
if (fc->sb_flags_mask & SB_RDONLY) {
867867
#ifdef CONFIG_BLOCK
868-
if (!(fc->sb_flags & SB_RDONLY) && bdev_read_only(sb->s_bdev))
868+
if (!(fc->sb_flags & SB_RDONLY) && sb->s_bdev &&
869+
bdev_read_only(sb->s_bdev))
869870
return -EACCES;
870871
#endif
871872

0 commit comments

Comments
 (0)