diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:30 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:30 +0100 |
| commit | ff7db6e05a93a23eb43c7d20dc2027bcc939b6a8 (patch) | |
| tree | b53e43b095579cbd4d26adb477f261df9ab46b61 /fs/btrfs/ctree.h | |
| parent | 23c1a966f2525e71f895bf349a5ae9e5d7bdd67f (diff) | |
| parent | 7aff8cf4a6d6190e64386f407a7f5cc5f24c60d2 (diff) | |
Merge branch 'foreign/zhaolei/reada' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 6af1211d4ee9..e2a5cc0d4a14 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1825,6 +1825,9 @@ struct btrfs_fs_info { spinlock_t reada_lock; struct radix_tree_root reada_tree; + /* readahead works cnt */ + atomic_t reada_works_cnt; + /* Extent buffer radix tree */ spinlock_t buffer_lock; struct radix_tree_root buffer_radix; @@ -4563,8 +4566,8 @@ struct reada_control *btrfs_reada_add(struct btrfs_root *root, struct btrfs_key *start, struct btrfs_key *end); int btrfs_reada_wait(void *handle); void btrfs_reada_detach(void *handle); -int btree_readahead_hook(struct btrfs_root *root, struct extent_buffer *eb, - u64 start, int err); +int btree_readahead_hook(struct btrfs_fs_info *fs_info, + struct extent_buffer *eb, u64 start, int err); static inline int is_fstree(u64 rootid) { |