btrfs: use SECTOR_SHIFT to convert physical offset to LBA

Use SECTOR_SHIFT while converting a physical address to an LBA, makes
it more readable.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 82e49d9..b440803 100644 (file)
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -1565,7 +1565,7 @@ static int btrfsic_read_block(struct btrfsic_state *state,
 
                bio = bio_alloc(block_ctx->dev->bdev, num_pages - i,
                                REQ_OP_READ, GFP_NOFS);
-               bio->bi_iter.bi_sector = dev_bytenr >> 9;
+               bio->bi_iter.bi_sector = dev_bytenr >> SECTOR_SHIFT;
 
                for (j = i; j < num_pages; j++) {
                        ret = bio_add_page(bio, block_ctx->pagev[j],

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 2d0493f..14f5f25 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -421,7 +421,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                 */
                if (!em || cur < em->start ||
                    (cur + fs_info->sectorsize > extent_map_end(em)) ||
-                   (em->block_start >> 9) != orig_bio->bi_iter.bi_sector) {
+                   (em->block_start >> SECTOR_SHIFT) != orig_bio->bi_iter.bi_sector) {
                        free_extent_map(em);
                        unlock_extent(tree, cur, page_end, NULL);
                        unlock_page(page);

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 1c326d5..3a4c6ab 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1245,7 +1245,8 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
                }
 
                if (size) {
-                       ret = blkdev_issue_discard(bdev, start >> 9, size >> 9,
+                       ret = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT,
+                                                  size >> SECTOR_SHIFT,
                                                   GFP_NOFS);
                        if (!ret)
                                *discarded_bytes += size;
@@ -1262,7 +1263,8 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
        }
 
        if (bytes_left) {
-               ret = blkdev_issue_discard(bdev, start >> 9, bytes_left >> 9,
+               ret = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT,
+                                          bytes_left >> SECTOR_SHIFT,
                                           GFP_NOFS);
                if (!ret)
                        *discarded_bytes += bytes_left;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7fcafcc..e6a21bb 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8639,7 +8639,7 @@ static int btrfs_getattr(struct mnt_idmap *idmap,
        inode_bytes = inode_get_bytes(inode);
        spin_unlock(&BTRFS_I(inode)->lock);
        stat->blocks = (ALIGN(inode_bytes, blocksize) +
-                       ALIGN(delalloc_bytes, blocksize)) >> 9;
+                       ALIGN(delalloc_bytes, blocksize)) >> SECTOR_SHIFT;
        return 0;
 }
 

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 2fab37f..d271c6e 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1099,7 +1099,7 @@ static int rbio_add_io_sector(struct btrfs_raid_bio *rbio,
        bio = bio_alloc(stripe->dev->bdev,
                        max(BTRFS_STRIPE_LEN >> PAGE_SHIFT, 1),
                        op, GFP_NOFS);
-       bio->bi_iter.bi_sector = disk_start >> 9;
+       bio->bi_iter.bi_sector = disk_start >> SECTOR_SHIFT;
        bio->bi_private = rbio;
 
        __bio_add_page(bio, sector->page, sectorsize, sector->pgoff);