Btrfs: Fix PAGE_CACHE_SHIFT shifts on 32 bit machines

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

diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c
index 3feac2f28628fc1503baf5bd82bc64d42a42da48..65ef12351566e23a1b124998251bca016dcf5ec2 100644 (file)
--- a/fs/btrfs/tree-defrag.c
+++ b/fs/btrfs/tree-defrag.c
@@ -76,7 +76,9 @@ static int defrag_walk_down(struct btrfs_trans_handle *trans,
                if (*level == 1) {
                        ret = btrfs_realloc_node(trans, root,
                                                 path->nodes[*level],
-                                                cache_only, last_ret);
+                                                path->slots[*level],
+                                                cache_only, last_ret,
+                                                &root->defrag_progress);
                        if (is_extent)
                                btrfs_extent_post_op(trans, root);
 
@@ -87,8 +89,8 @@ static int defrag_walk_down(struct btrfs_trans_handle *trans,
                if (cache_only) {
                        next = btrfs_find_tree_block(root, bytenr,
                                           btrfs_level_size(root, *level - 1));
-                       /* FIXME, test for defrag */
-                       if (!next || !btrfs_buffer_uptodate(next)) {
+                       if (!next || !btrfs_buffer_uptodate(next) ||
+                           !btrfs_buffer_defrag(next)) {
                                free_extent_buffer(next);
                                path->slots[*level]++;
                                continue;
@@ -100,10 +102,6 @@ static int defrag_walk_down(struct btrfs_trans_handle *trans,
                ret = btrfs_cow_block(trans, root, next, path->nodes[*level],
                                      path->slots[*level], &next);
                BUG_ON(ret);
-               ret = btrfs_realloc_node(trans, root, next, cache_only,
-                                        last_ret);
-               BUG_ON(ret);
-
                if (is_extent)
                        btrfs_extent_post_op(trans, root);
 
@@ -116,15 +114,14 @@ static int defrag_walk_down(struct btrfs_trans_handle *trans,
        }
        WARN_ON(*level < 0);
        WARN_ON(*level >= BTRFS_MAX_LEVEL);
-#if 0
-       clear_buffer_defrag(path->nodes[*level]);
-       clear_buffer_defrag_done(path->nodes[*level]);
-#endif
+
+       btrfs_clear_buffer_defrag(path->nodes[*level]);
+
        free_extent_buffer(path->nodes[*level]);
        path->nodes[*level] = NULL;
        *level += 1;
-       WARN_ON(ret);
-       return 0;
+       WARN_ON(ret && ret != -EAGAIN);
+       return ret;
 }
 
 static int defrag_walk_up(struct btrfs_trans_handle *trans,
@@ -148,10 +145,7 @@ static int defrag_walk_up(struct btrfs_trans_handle *trans,
                        root->defrag_level = i;
                        return 0;
                } else {
-                       /*
-                       clear_buffer_defrag(path->nodes[*level]);
-                       clear_buffer_defrag_done(path->nodes[*level]);
-                       */
+                       btrfs_clear_buffer_defrag(path->nodes[*level]);
                        free_extent_buffer(path->nodes[*level]);
                        path->nodes[*level] = NULL;
                        *level = i + 1;
@@ -185,6 +179,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
 
        level = btrfs_header_level(root->node);
        orig_level = level;
+
        if (level == 0) {
                goto out;
        }
@@ -192,9 +187,6 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
                extent_buffer_get(root->node);
                ret = btrfs_cow_block(trans, root, root->node, NULL, 0, &tmp);
                BUG_ON(ret);
-               ret = btrfs_realloc_node(trans, root, root->node, cache_only,
-                                        &last_ret);
-               BUG_ON(ret);
                path->nodes[level] = root->node;
                path->slots[level] = 0;
                if (is_extent)
@@ -241,7 +233,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
        for (i = 0; i <= orig_level; i++) {
                if (path->nodes[i]) {
                        free_extent_buffer(path->nodes[i]);
-                       path->nodes[i] = 0;
+                       path->nodes[i] = NULL;
                }
        }
 out: