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>
This commit is contained in:
parent
29e70be261
commit
adbe7e388e
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user