From bab6edaa8e9392f8cb26e54222324b379260f2e2 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Fri, 3 Oct 2008 16:31:08 -0400 Subject: [PATCH] --- yaml --- r: 128971 b: refs/heads/master c: a62b940160d8125016e85046e68ae621c99e751f h: refs/heads/master i: 128969: 6e9689fc89a9bbf9f828b5366841fcd218eb327d 128967: 048b101b94e8554f525c204ef9f4c34ecb507639 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 2 +- trunk/fs/btrfs/volumes.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 15c6c38637ce..5f6ccab2822f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30c43e2444c16afe3b2130f40ad273541bf3dc36 +refs/heads/master: a62b940160d8125016e85046e68ae621c99e751f diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index e5c9261dcbaa..ff0c35976657 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -386,7 +386,7 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset, { struct btrfs_root *root = BTRFS_I(page->mapping->host)->root; struct btrfs_mapping_tree *map_tree; - u64 logical = bio->bi_sector << 9; + u64 logical = (u64)bio->bi_sector << 9; u64 length = 0; u64 map_length; int ret; diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c index f63cf7621a01..2eed7f91f51a 100644 --- a/trunk/fs/btrfs/volumes.c +++ b/trunk/fs/btrfs/volumes.c @@ -2187,7 +2187,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio, struct btrfs_mapping_tree *map_tree; struct btrfs_device *dev; struct bio *first_bio = bio; - u64 logical = bio->bi_sector << 9; + u64 logical = (u64)bio->bi_sector << 9; u64 length = 0; u64 map_length; struct btrfs_multi_bio *multi = NULL;