btrfs: use SECTOR_SHIFT to convert LBA to physical offset

Using SECTOR_SHIFT to convert LBA to physical address 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/bio.c b/fs/btrfs/bio.c
index b3ad0f51e6162eea34550605d13d54031904b851..2a182edcfb61acd463beebd42de28abaf8548312 100644 (file)
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -635,7 +635,7 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
        struct btrfs_fs_info *fs_info = bbio->fs_info;
        struct btrfs_bio *orig_bbio = bbio;
        struct bio *bio = &bbio->bio;
-       u64 logical = bio->bi_iter.bi_sector << 9;
+       u64 logical = bio->bi_iter.bi_sector << SECTOR_SHIFT;
        u64 length = bio->bi_iter.bi_size;
        u64 map_length = length;
        bool use_append = btrfs_use_zone_append(bbio);

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 3a4c6ab80403bb7cf2f5e20cf9684a1bee95e0d5..581ddb24e113c8c51b5d56b510ef1707c8074106 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1203,11 +1203,11 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
 {
        int j, ret = 0;
        u64 bytes_left, end;
-       u64 aligned_start = ALIGN(start, 1 << 9);
+       u64 aligned_start = ALIGN(start, 1 << SECTOR_SHIFT);
 
        if (WARN_ON(start != aligned_start)) {
                len -= aligned_start - start;
-               len = round_down(len, 1 << 9);
+               len = round_down(len, 1 << SECTOR_SHIFT);
                start = aligned_start;
        }
 

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index d1cd0a692f8efb8fe4f475874536d12235c04527..e74b9804bcdec811b18e903cddd81208ec42d655 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -749,7 +749,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio)
        sums->len = bio->bi_iter.bi_size;
        INIT_LIST_HEAD(&sums->list);
 
-       sums->bytenr = bio->bi_iter.bi_sector << 9;
+       sums->bytenr = bio->bi_iter.bi_sector << SECTOR_SHIFT;
        index = 0;
 
        shash->tfm = fs_info->csum_shash;
@@ -799,7 +799,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio)
                                ordered = btrfs_lookup_ordered_extent(inode,
                                                                offset);
                                ASSERT(ordered); /* Logic error */
-                               sums->bytenr = (bio->bi_iter.bi_sector << 9)
+                               sums->bytenr = (bio->bi_iter.bi_sector << SECTOR_SHIFT)
                                        + total_bytes;
                                index = 0;
                        }

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index d271c6e04dcc29e177c2bd30852693d429ca7ed8..3c08e132d83d7a40d1a3f34de0c351c0080ad38d 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1079,7 +1079,7 @@ static int rbio_add_io_sector(struct btrfs_raid_bio *rbio,
 
        /* see if we can add this page onto our existing bio */
        if (last) {
-               u64 last_end = last->bi_iter.bi_sector << 9;
+               u64 last_end = last->bi_iter.bi_sector << SECTOR_SHIFT;
                last_end += last->bi_iter.bi_size;
 
                /*