Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 128711
b: refs/heads/master
c: 587f770
h: refs/heads/master
i:
  128709: 39c8ffe
  128707: 0584cea
  128703: 075ac83
v: v3
  • Loading branch information
Chris Mason committed Sep 25, 2008
1 parent 7dcb085 commit d7ece4d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3dd39914bc0737d055c780d29c20a1d117819cdb
refs/heads/master: 587f77043a1c86e2a7900ff2ce86bef3c1f4e075
8 changes: 5 additions & 3 deletions trunk/fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit d7ece4d

Please sign in to comment.