diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-10-06 06:15:04 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-10-19 05:53:22 -0600 |
| commit | db9a02baa23267c695a44234a0f2f4607992780e (patch) | |
| tree | 5763bbfbcb0774571843d21bcd340cc219ff397b | |
| parent | e0d78afeb8d190164a823d5ef5821b0b3802af33 (diff) | |
| download | linux-db9a02baa23267c695a44234a0f2f4607992780e.tar.gz linux-db9a02baa23267c695a44234a0f2f4607992780e.tar.bz2 linux-db9a02baa23267c695a44234a0f2f4607992780e.zip | |
block: move bdev_read_only() into the header
This is called for every write in the fast path, move it inline next
to get_disk_ro() which is called internally.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/genhd.c | 6 | ||||
| -rw-r--r-- | include/linux/genhd.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/block/genhd.c b/block/genhd.c index 759bc06810f8..80943c123c3e 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1389,12 +1389,6 @@ void set_disk_ro(struct gendisk *disk, bool read_only) } EXPORT_SYMBOL(set_disk_ro); -int bdev_read_only(struct block_device *bdev) -{ - return bdev->bd_read_only || get_disk_ro(bdev->bd_disk); -} -EXPORT_SYMBOL(bdev_read_only); - void inc_diskseq(struct gendisk *disk) { disk->diskseq = atomic64_inc_return(&diskseq); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index cd4038fd5743..c70bc5fce4db 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -221,6 +221,11 @@ static inline int get_disk_ro(struct gendisk *disk) test_bit(GD_READ_ONLY, &disk->state); } +static inline int bdev_read_only(struct block_device *bdev) +{ + return bdev->bd_read_only || get_disk_ro(bdev->bd_disk); +} + extern void disk_block_events(struct gendisk *disk); extern void disk_unblock_events(struct gendisk *disk); extern void disk_flush_events(struct gendisk *disk, unsigned int mask); |