Commit 6f0d9689 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1e0dcca9

block/genhd.c

+0 −3
Original line number Diff line number Diff line
@@ -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);



/*

fs/super.c

+2 −1
Original line number Diff line number Diff line
@@ -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