mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
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 <[email protected]> Reviewed-by: Ming Lei <[email protected]> Reviewed-by: Martin K. Petersen <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
1 parent
1e0dcca9e1
commit
6f0d9689b6
2 files changed
+2
-4
No files matched your search
@@ -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);
|
||||
|
||||
/*
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user