Commit adbe7e38 authored by Anand Jain's avatar Anand Jain Committed by David Sterba

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: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 29e70be2
...@@ -635,7 +635,7 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num) ...@@ -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_fs_info *fs_info = bbio->fs_info;
struct btrfs_bio *orig_bbio = bbio; struct btrfs_bio *orig_bbio = bbio;
struct bio *bio = &bbio->bio; 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 length = bio->bi_iter.bi_size;
u64 map_length = length; u64 map_length = length;
bool use_append = btrfs_use_zone_append(bbio); bool use_append = btrfs_use_zone_append(bbio);
......
...@@ -1203,11 +1203,11 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, ...@@ -1203,11 +1203,11 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
{ {
int j, ret = 0; int j, ret = 0;
u64 bytes_left, end; 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)) { if (WARN_ON(start != aligned_start)) {
len -= aligned_start - start; len -= aligned_start - start;
len = round_down(len, 1 << 9); len = round_down(len, 1 << SECTOR_SHIFT);
start = aligned_start; start = aligned_start;
} }
......
...@@ -749,7 +749,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio) ...@@ -749,7 +749,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio)
sums->len = bio->bi_iter.bi_size; sums->len = bio->bi_iter.bi_size;
INIT_LIST_HEAD(&sums->list); INIT_LIST_HEAD(&sums->list);
sums->bytenr = bio->bi_iter.bi_sector << 9; sums->bytenr = bio->bi_iter.bi_sector << SECTOR_SHIFT;
index = 0; index = 0;
shash->tfm = fs_info->csum_shash; shash->tfm = fs_info->csum_shash;
...@@ -799,7 +799,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio) ...@@ -799,7 +799,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio)
ordered = btrfs_lookup_ordered_extent(inode, ordered = btrfs_lookup_ordered_extent(inode,
offset); offset);
ASSERT(ordered); /* Logic error */ ASSERT(ordered); /* Logic error */
sums->bytenr = (bio->bi_iter.bi_sector << 9) sums->bytenr = (bio->bi_iter.bi_sector << SECTOR_SHIFT)
+ total_bytes; + total_bytes;
index = 0; index = 0;
} }
......
...@@ -1079,7 +1079,7 @@ static int rbio_add_io_sector(struct btrfs_raid_bio *rbio, ...@@ -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 */ /* see if we can add this page onto our existing bio */
if (last) { 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; last_end += last->bi_iter.bi_size;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment