btrfs: reada: Use fs_info instead of root in __readahead_hook's argument

[linux-2.6-block.git] / fs / btrfs / reada.c

diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index 203bec4823e1c36c4ef72e9b9fdb50385cc5bf95..6d9069d019141c0e4098ee60640e63fad5000916 100644 (file)
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -105,15 +105,15 @@ static int reada_add_block(struct reada_control *rc, u64 logical,
 
 /* recurses */
 /* in case of err, eb might be NULL */
-static void __readahead_hook(struct btrfs_root *root, struct reada_extent *re,
-                            struct extent_buffer *eb, u64 start, int err)
+static void __readahead_hook(struct btrfs_fs_info *fs_info,
+                            struct reada_extent *re, struct extent_buffer *eb,
+                            u64 start, int err)
 {
        int level = 0;
        int nritems;
        int i;
        u64 bytenr;
        u64 generation;
-       struct btrfs_fs_info *fs_info = root->fs_info;
        struct list_head list;
        struct btrfs_device *for_dev;
 
@@ -176,10 +176,10 @@ static void __readahead_hook(struct btrfs_root *root, struct reada_extent *re,
                         */
 #ifdef DEBUG
                        if (rec->generation != generation) {
-                               btrfs_debug(root->fs_info,
-                                          "generation mismatch for (%llu,%d,%llu) %llu != %llu",
-                                      key.objectid, key.type, key.offset,
-                                      rec->generation, generation);
+                               btrfs_debug(fs_info,
+                                           "generation mismatch for (%llu,%d,%llu) %llu != %llu",
+                                           key.objectid, key.type, key.offset,
+                                           rec->generation, generation);
                        }
 #endif
                        if (rec->generation == generation &&
@@ -220,12 +220,11 @@ static void __readahead_hook(struct btrfs_root *root, struct reada_extent *re,
  * start is passed separately in case eb in NULL, which may be the case with
  * failed I/O
  */
-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)
 {
        int ret = 0;
        struct reada_extent *re;
-       struct btrfs_fs_info *fs_info = root->fs_info;
 
        /* find extent */
        spin_lock(&fs_info->reada_lock);
@@ -724,9 +723,9 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
        ret = reada_tree_block_flagged(fs_info->extent_root, logical,
                        mirror_num, &eb);
        if (ret)
-               __readahead_hook(fs_info->extent_root, re, NULL, logical, ret);
+               __readahead_hook(fs_info, re, NULL, logical, ret);
        else if (eb)
-               __readahead_hook(fs_info->extent_root, re, eb, eb->start, ret);
+               __readahead_hook(fs_info, re, eb, eb->start, ret);
 
        if (eb)
                free_extent_buffer(eb);