From d7ece4ddd5b2bdc5fe829f901de58ac4dbb9bcfd Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Fri, 11 Apr 2008 12:16:46 -0400 Subject: [PATCH] --- yaml --- r: 128711 b: refs/heads/master c: 587f77043a1c86e2a7900ff2ce86bef3c1f4e075 h: refs/heads/master i: 128709: 39c8ffec08d743e44fda4eced1e23cdcb2a8e312 128707: 0584cea90c66e85c252713751f2c9e73ee34c72d 128703: 075ac83941ed5952ee5b9631fb3adbbd652aec9a v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 43f2c32b763e..2d20c107b9c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dd39914bc0737d055c780d29c20a1d117819cdb +refs/heads/master: 587f77043a1c86e2a7900ff2ce86bef3c1f4e075 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 32e778fb014e..46f54dfa2b0a 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/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,