diff options
author | Colin Cross <ccross@android.com> | 2012-05-01 15:47:09 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-05-01 15:47:09 -0700 |
commit | aadf030d84352a91cdadf50f947da739c5611450 (patch) | |
tree | 5f22ec57ee257776b4c157f0c91f3612f05ed6c5 /fs/btrfs/extent_io.h | |
parent | aad2732ba0dddcf3446a4e3c4843496759c1c305 (diff) | |
parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) |
Merge commit 'v3.4-rc5' into android-3.4
Diffstat (limited to 'fs/btrfs/extent_io.h')
-rw-r--r-- | fs/btrfs/extent_io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index faf10eb57f7..b516c3b8dec 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -79,7 +79,7 @@ struct extent_io_ops { u64 start, u64 end, struct extent_state *state); int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end, - struct extent_state *state); + struct extent_state *state, int mirror); int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end, struct extent_state *state, int uptodate); void (*set_bit_hook)(struct inode *inode, struct extent_state *state, @@ -135,7 +135,7 @@ struct extent_buffer { spinlock_t refs_lock; atomic_t refs; atomic_t io_pages; - int failed_mirror; + int read_mirror; struct list_head leak_list; struct rcu_head rcu_head; pid_t lock_owner; |