diff options
| author | Chris Mason <chris.mason@oracle.com> | 2008-10-03 16:31:08 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-10-03 16:31:08 -0400 |
| commit | a62b940160d8125016e85046e68ae621c99e751f (patch) | |
| tree | c26ebe1ccf229f829513e1fc85c8110928187e13 | |
| parent | 30c43e2444c16afe3b2130f40ad273541bf3dc36 (diff) | |
| download | op-kernel-dev-a62b940160d8125016e85046e68ae621c99e751f.zip op-kernel-dev-a62b940160d8125016e85046e68ae621c99e751f.tar.gz | |
Btrfs: cast bio->bi_sector to a u64 before shifting
On 32 bit machines without CONFIG_LBD, the bi_sector field is only 32 bits.
Btrfs needs to cast it before shifting up, or we end up doing IO into
the wrong place.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -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 e5c9261..ff0c359 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, { 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/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index f63cf76..2eed7f9 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, 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; |
