diff options
| -rw-r--r-- | block/fops.c | 4 | ||||
| -rw-r--r-- | include/linux/genhd.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/block/fops.c b/block/fops.c index 4e22b0794c82..ad732a36f9b3 100644 --- a/block/fops.c +++ b/block/fops.c @@ -527,7 +527,7 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from) { struct block_device *bdev = iocb->ki_filp->private_data; struct inode *bd_inode = bdev->bd_inode; - loff_t size = i_size_read(bd_inode); + loff_t size = bdev_nr_bytes(bdev); struct blk_plug plug; size_t shorted = 0; ssize_t ret; @@ -565,7 +565,7 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from) static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to) { struct block_device *bdev = iocb->ki_filp->private_data; - loff_t size = i_size_read(bdev->bd_inode); + loff_t size = bdev_nr_bytes(bdev); loff_t pos = iocb->ki_pos; size_t shorted = 0; ssize_t ret; diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 59eabbc3a36b..462634b4b48f 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -250,7 +250,7 @@ static inline sector_t bdev_nr_sectors(struct block_device *bdev) static inline loff_t bdev_nr_bytes(struct block_device *bdev) { - return bdev_nr_sectors(bdev) << SECTOR_SHIFT; + return (loff_t)bdev_nr_sectors(bdev) << SECTOR_SHIFT; } static inline sector_t get_capacity(struct gendisk *disk) |