diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/inode.c | 2 | ||||
-rw-r--r-- | fs/btrfs/volumes.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index e5c9261dcbaa..ff0c35976657 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -386,7 +386,7 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset, | |||
386 | { | 386 | { |
387 | struct btrfs_root *root = BTRFS_I(page->mapping->host)->root; | 387 | struct btrfs_root *root = BTRFS_I(page->mapping->host)->root; |
388 | struct btrfs_mapping_tree *map_tree; | 388 | struct btrfs_mapping_tree *map_tree; |
389 | u64 logical = bio->bi_sector << 9; | 389 | u64 logical = (u64)bio->bi_sector << 9; |
390 | u64 length = 0; | 390 | u64 length = 0; |
391 | u64 map_length; | 391 | u64 map_length; |
392 | int ret; | 392 | int ret; |
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index f63cf7621a01..2eed7f91f51a 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -2187,7 +2187,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio, | |||
2187 | struct btrfs_mapping_tree *map_tree; | 2187 | struct btrfs_mapping_tree *map_tree; |
2188 | struct btrfs_device *dev; | 2188 | struct btrfs_device *dev; |
2189 | struct bio *first_bio = bio; | 2189 | struct bio *first_bio = bio; |
2190 | u64 logical = bio->bi_sector << 9; | 2190 | u64 logical = (u64)bio->bi_sector << 9; |
2191 | u64 length = 0; | 2191 | u64 length = 0; |
2192 | u64 map_length; | 2192 | u64 map_length; |
2193 | struct btrfs_multi_bio *multi = NULL; | 2193 | struct btrfs_multi_bio *multi = NULL; |