Commit 1201b58b authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop casts of bio bi_sector 



Since commit 72deb455 ("block: remove CONFIG_LBDAF") (5.2) the
sector_t type is u64 on all arches and configs so we don't need to
typecast it.  It used to be unsigned long and the result of sector size
shifts were not guaranteed to fit in the type.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 12659251

fs/btrfs/check-integrity.c

+1 −2
Original line number Diff line number Diff line
@@ -2692,8 +2692,7 @@ static void __btrfsic_submit_bio(struct bio *bio) 
		    BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH)

			pr_info("submit_bio(rw=%d,0x%x, bi_vcnt=%u, bi_sector=%llu (bytenr %llu), bi_disk=%p)\n",

			       bio_op(bio), bio->bi_opf, segs,

			       (unsigned long long)bio->bi_iter.bi_sector,

			       dev_bytenr, bio->bi_disk);

			       bio->bi_iter.bi_sector, dev_bytenr, bio->bi_disk);



		mapped_datav = kmalloc_array(segs,

					     sizeof(*mapped_datav), GFP_NOFS);

fs/btrfs/compression.c

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void end_compressed_bio_read(struct bio *bio) 


	inode = cb->inode;

	ret = check_compressed_csum(BTRFS_I(inode), bio,

				    (u64)bio->bi_iter.bi_sector << 9);

				    bio->bi_iter.bi_sector << 9);

	if (ret)

		goto csum_failed;
@@ -620,7 +620,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	unsigned long pg_index;

	struct page *page;

	struct bio *comp_bio;

	u64 cur_disk_byte = (u64)bio->bi_iter.bi_sector << 9;

	u64 cur_disk_byte = bio->bi_iter.bi_sector << 9;

	u64 em_len;

	u64 em_start;

	struct extent_map *em;

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -2886,7 +2886,7 @@ static void end_bio_extent_readpage(struct bio *bio) 


		btrfs_debug(fs_info,

			"end_bio_extent_readpage: bi_sector=%llu, err=%d, mirror=%u",

			(u64)bio->bi_iter.bi_sector, bio->bi_status,

			bio->bi_iter.bi_sector, bio->bi_status,

			io_bio->mirror_num);

		tree = &BTRFS_I(inode)->io_tree;

		failure_tree = &BTRFS_I(inode)->io_failure_tree;

fs/btrfs/file-item.c

+3 −3
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, 
		path->skip_locking = 1;

	}



	disk_bytenr = (u64)bio->bi_iter.bi_sector << 9;

	disk_bytenr = bio->bi_iter.bi_sector << 9;



	bio_for_each_segment(bvec, bio, iter) {

		page_bytes_left = bvec.bv_len;
@@ -560,7 +560,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_inode *inode, struct bio *bio, 
	else

		offset = 0; /* shut up gcc */



	sums->bytenr = (u64)bio->bi_iter.bi_sector << 9;

	sums->bytenr = bio->bi_iter.bi_sector << 9;

	index = 0;



	shash->tfm = fs_info->csum_shash;
@@ -599,7 +599,7 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_inode *inode, struct bio *bio, 
				ordered = btrfs_lookup_ordered_extent(inode,

								offset);

				ASSERT(ordered); /* Logic error */

				sums->bytenr = ((u64)bio->bi_iter.bi_sector << 9)

				sums->bytenr = (bio->bi_iter.bi_sector << 9)

					+ total_bytes;

				index = 0;

			}

fs/btrfs/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ int btrfs_bio_fits_in_stripe(struct page *page, size_t size, struct bio *bio, 
{

	struct inode *inode = page->mapping->host;

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	u64 logical = (u64)bio->bi_iter.bi_sector << 9;

	u64 logical = bio->bi_iter.bi_sector << 9;

	u64 length = 0;

	u64 map_length;

	int ret;
@@ -7820,8 +7820,7 @@ static void btrfs_end_dio_bio(struct bio *bio) 
		btrfs_warn(BTRFS_I(dip->inode)->root->fs_info,

			   "direct IO failed ino %llu rw %d,%u sector %#Lx len %u err no %d",

			   btrfs_ino(BTRFS_I(dip->inode)), bio_op(bio),

			   bio->bi_opf,

			   (unsigned long long)bio->bi_iter.bi_sector,

			   bio->bi_opf, bio->bi_iter.bi_sector,

			   bio->bi_iter.bi_size, err);



	if (bio_op(bio) == REQ_OP_READ) {
@@ -7913,7 +7912,7 @@ static struct btrfs_dio_private *btrfs_create_dio_private(struct bio *dio_bio, 
	dip->inode = inode;

	dip->logical_offset = file_offset;

	dip->bytes = dio_bio->bi_iter.bi_size;

	dip->disk_bytenr = (u64)dio_bio->bi_iter.bi_sector << 9;

	dip->disk_bytenr = dio_bio->bi_iter.bi_sector << 9;

	dip->dio_bio = dio_bio;

	refcount_set(&dip->refs, 1);

	return dip;