Merge tag 'xfs-5.16-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[platform/kernel/linux-starfive.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index c615387..46bc589 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -878,7 +878,7 @@ link_dev_buffers(struct page *page, struct buffer_head *head)
 static sector_t blkdev_max_block(struct block_device *bdev, unsigned int size)
 {
        sector_t retval = ~((sector_t)0);
-       loff_t sz = i_size_read(bdev->bd_inode);
+       loff_t sz = bdev_nr_bytes(bdev);
 
        if (sz) {
                unsigned int sizebits = blksize_bits(size);
@@ -897,7 +897,7 @@ init_page_buffers(struct page *page, struct block_device *bdev,
        struct buffer_head *head = page_buffers(page);
        struct buffer_head *bh = head;
        int uptodate = PageUptodate(page);
-       sector_t end_block = blkdev_max_block(I_BDEV(bdev->bd_inode), size);
+       sector_t end_block = blkdev_max_block(bdev, size);
 
        do {
                if (!buffer_mapped(bh)) {