bcache: remove bdev_sectors

Use the equivalent block layer helper instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Acked-by: Coly Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20211018101130.1838532-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index f2874c7..4f89985 100644 (file)
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1002,7 +1002,7 @@ static void calc_cached_dev_sectors(struct cache_set *c)
        struct cached_dev *dc;
 
        list_for_each_entry(dc, &c->cached_devs, list)
-               sectors += bdev_sectors(dc->bdev);
+               sectors += bdev_nr_sectors(dc->bdev);
 
        c->cached_dev_sectors = sectors;
 }

diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
index b64460a..a7da793 100644 (file)
--- a/drivers/md/bcache/util.h
+++ b/drivers/md/bcache/util.h
@@ -584,8 +584,4 @@ static inline unsigned int fract_exp_two(unsigned int x,
 void bch_bio_map(struct bio *bio, void *base);
 int bch_bio_alloc_pages(struct bio *bio, gfp_t gfp_mask);
 
-static inline sector_t bdev_sectors(struct block_device *bdev)
-{
-       return bdev->bd_inode->i_size >> 9;
-}
 #endif /* _BCACHE_UTIL_H */

diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c
index 8120da2..c7560f6 100644 (file)
--- a/drivers/md/bcache/writeback.c
+++ b/drivers/md/bcache/writeback.c
@@ -45,7 +45,7 @@ static uint64_t __calc_target_rate(struct cached_dev *dc)
         * backing volume uses about 2% of the cache for dirty data.
         */
        uint32_t bdev_share =
-               div64_u64(bdev_sectors(dc->bdev) << WRITEBACK_SHARE_SHIFT,
+               div64_u64(bdev_nr_sectors(dc->bdev) << WRITEBACK_SHARE_SHIFT,
                                c->cached_dev_sectors);
 
        uint64_t cache_dirty_target =