| Message ID | 20211015132643.1621913-5-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/30] block: move the SECTOR_SIZE related definitions to blk_types.h | expand |
On 10/15/21 6:26 AM, Christoph Hellwig wrote: > Use the proper helper to read the block device size. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Kees Cook <keescook@chromium.org> > Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> > --- > drivers/block/drbd/drbd_int.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h > index 5d9181382ce19..75fda53eed8cf 100644 > --- a/drivers/block/drbd/drbd_int.h > +++ b/drivers/block/drbd/drbd_int.h > @@ -1826,8 +1826,7 @@ static inline sector_t drbd_md_last_sector(struct drbd_backing_dev *bdev) > /* Returns the number of 512 byte sectors of the device */ > static inline sector_t drbd_get_capacity(struct block_device *bdev) > { > - /* return bdev ? get_capacity(bdev->bd_disk) : 0; */ > - return bdev ? i_size_read(bdev->bd_inode) >> 9 : 0; > + return bdev ? bdev_nr_sectors(bdev) : 0; > } > > /** > Reviewed-by: Lee Duncan <lduncan@suse.com>
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 5d9181382ce19..75fda53eed8cf 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1826,8 +1826,7 @@ static inline sector_t drbd_md_last_sector(struct drbd_backing_dev *bdev) /* Returns the number of 512 byte sectors of the device */ static inline sector_t drbd_get_capacity(struct block_device *bdev) { - /* return bdev ? get_capacity(bdev->bd_disk) : 0; */ - return bdev ? i_size_read(bdev->bd_inode) >> 9 : 0; + return bdev ? bdev_nr_sectors(bdev) : 0; } /**