diff options
| author | Chris Mason | 2008-04-11 18:16:46 +0200 |
|---|---|---|
| committer | Chris Mason | 2008-09-25 17:04:01 +0200 |
| commit | 587f77043a1c86e2a7900ff2ce86bef3c1f4e075 (patch) | |
| tree | 340fa3bdf11073f12a6cb2136c80013e38d15d17 | |
| parent | Btrfs: Add extra checks to avoid removing extent_state from pages we can't free (diff) | |
| download | kernel-qcow2-linux-587f77043a1c86e2a7900ff2ce86bef3c1f4e075.tar.gz kernel-qcow2-linux-587f77043a1c86e2a7900ff2ce86bef3c1f4e075.tar.xz kernel-qcow2-linux-587f77043a1c86e2a7900ff2ce86bef3c1f4e075.zip | |
Btrfs: Fixup a few u64<->pointer casts for 32 bit
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/inode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 32e778fb014e..46f54dfa2b0a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -430,9 +430,10 @@ int btrfs_readpage_io_failed_hook(struct bio *failed_bio, free_extent_map(em); set_extent_bits(failure_tree, start, end, EXTENT_LOCKED | EXTENT_DIRTY, GFP_NOFS); - set_state_private(failure_tree, start, (u64)failrec); + set_state_private(failure_tree, start, + (u64)(unsigned long)failrec); } else { - failrec = (struct io_failure_record *)private; + failrec = (struct io_failure_record *)(unsigned long)private; } num_copies = btrfs_num_copies( &BTRFS_I(inode)->root->fs_info->mapping_tree, @@ -511,7 +512,8 @@ int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end, ret = get_state_private(&BTRFS_I(inode)->io_failure_tree, start, &private_failure); if (ret == 0) { - failure = (struct io_failure_record *)private_failure; + failure = (struct io_failure_record *)(unsigned long) + private_failure; set_state_private(&BTRFS_I(inode)->io_failure_tree, failure->start, 0); clear_extent_bits(&BTRFS_I(inode)->io_failure_tree, |