Btrfs: change around extent-tree prealloc
[deliverable/linux.git] / fs / btrfs / ctree.c
index 39b551564fcf4e9333fa48af47e241f17bc5fbdc..b4783bf8bf4fc2729c1cedaacd272917fcb88885 100644 (file)
@@ -66,21 +66,22 @@ static int btrfs_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root
        if (buf->b_size != root->blocksize || cow->b_size != root->blocksize)
                WARN_ON(1);
        memcpy(cow_node, btrfs_buffer_node(buf), root->blocksize);
-       btrfs_set_header_blocknr(&cow_node->header, cow->b_blocknr);
+       btrfs_set_header_blocknr(&cow_node->header, bh_blocknr(cow));
        btrfs_set_header_generation(&cow_node->header, trans->transid);
+       btrfs_set_header_owner(&cow_node->header, root->root_key.objectid);
        btrfs_inc_ref(trans, root, buf);
        if (buf == root->node) {
                root->node = cow;
                get_bh(cow);
                if (buf != root->commit_root) {
-                       btrfs_free_extent(trans, root, buf->b_blocknr, 1, 1);
+                       btrfs_free_extent(trans, root, bh_blocknr(buf), 1, 1);
                }
                btrfs_block_release(root, buf);
        } else {
                btrfs_set_node_blockptr(btrfs_buffer_node(parent), parent_slot,
-                                       cow->b_blocknr);
+                                       bh_blocknr(cow));
                btrfs_mark_buffer_dirty(parent);
-               btrfs_free_extent(trans, root, buf->b_blocknr, 1, 1);
+               btrfs_free_extent(trans, root, bh_blocknr(buf), 1, 1);
        }
        btrfs_block_release(root, buf);
        mark_buffer_dirty(cow);
@@ -115,14 +116,14 @@ static int comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
                return 1;
        if (k1.objectid < k2->objectid)
                return -1;
-       if (k1.offset > k2->offset)
-               return 1;
-       if (k1.offset < k2->offset)
-               return -1;
        if (k1.flags > k2->flags)
                return 1;
        if (k1.flags < k2->flags)
                return -1;
+       if (k1.offset > k2->offset)
+               return 1;
+       if (k1.offset < k2->offset)
+               return -1;
        return 0;
 }
 
@@ -312,7 +313,7 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
         */
        if (!parent_buf) {
                struct buffer_head *child;
-               u64 blocknr = mid_buf->b_blocknr;
+               u64 blocknr = bh_blocknr(mid_buf);
 
                if (btrfs_header_nritems(&mid->header) != 1)
                        return 0;
@@ -361,7 +362,7 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
                if (wret < 0)
                        ret = wret;
                if (btrfs_header_nritems(&right->header) == 0) {
-                       u64 blocknr = right_buf->b_blocknr;
+                       u64 blocknr = bh_blocknr(right_buf);
                        clean_tree_block(trans, root, right_buf);
                        wait_on_buffer(right_buf);
                        btrfs_block_release(root, right_buf);
@@ -400,7 +401,7 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
        }
        if (btrfs_header_nritems(&mid->header) == 0) {
                /* we've managed to empty the middle node, drop it */
-               u64 blocknr = mid_buf->b_blocknr;
+               u64 blocknr = bh_blocknr(mid_buf);
                clean_tree_block(trans, root, mid_buf);
                wait_on_buffer(mid_buf);
                btrfs_block_release(root, mid_buf);
@@ -448,6 +449,124 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
        return ret;
 }
 
+/* returns zero if the push worked, non-zero otherwise */
+static int push_nodes_for_insert(struct btrfs_trans_handle *trans,
+                               struct btrfs_root *root,
+                               struct btrfs_path *path, int level)
+{
+       struct buffer_head *right_buf;
+       struct buffer_head *mid_buf;
+       struct buffer_head *left_buf;
+       struct buffer_head *parent_buf = NULL;
+       struct btrfs_node *right = NULL;
+       struct btrfs_node *mid;
+       struct btrfs_node *left = NULL;
+       struct btrfs_node *parent = NULL;
+       int ret = 0;
+       int wret;
+       int pslot;
+       int orig_slot = path->slots[level];
+       u64 orig_ptr;
+
+       if (level == 0)
+               return 1;
+
+       mid_buf = path->nodes[level];
+       mid = btrfs_buffer_node(mid_buf);
+       orig_ptr = btrfs_node_blockptr(mid, orig_slot);
+
+       if (level < BTRFS_MAX_LEVEL - 1)
+               parent_buf = path->nodes[level + 1];
+       pslot = path->slots[level + 1];
+
+       if (!parent_buf)
+               return 1;
+       parent = btrfs_buffer_node(parent_buf);
+
+       left_buf = read_node_slot(root, parent_buf, pslot - 1);
+
+       /* first, try to make some room in the middle buffer */
+       if (left_buf) {
+               u32 left_nr;
+               left = btrfs_buffer_node(left_buf);
+               left_nr = btrfs_header_nritems(&left->header);
+               if (left_nr >= BTRFS_NODEPTRS_PER_BLOCK(root) - 1) {
+                       wret = 1;
+               } else {
+                       btrfs_cow_block(trans, root, left_buf, parent_buf,
+                                       pslot - 1, &left_buf);
+                       left = btrfs_buffer_node(left_buf);
+                       wret = push_node_left(trans, root, left_buf, mid_buf);
+               }
+               if (wret < 0)
+                       ret = wret;
+               if (wret == 0) {
+                       orig_slot += left_nr;
+                       btrfs_memcpy(root, parent,
+                                    &parent->ptrs[pslot].key,
+                                    &mid->ptrs[0].key,
+                                    sizeof(struct btrfs_disk_key));
+                       btrfs_mark_buffer_dirty(parent_buf);
+                       if (btrfs_header_nritems(&left->header) > orig_slot) {
+                               path->nodes[level] = left_buf;
+                               path->slots[level + 1] -= 1;
+                               path->slots[level] = orig_slot;
+                               btrfs_block_release(root, mid_buf);
+                       } else {
+                               orig_slot -=
+                                       btrfs_header_nritems(&left->header);
+                               path->slots[level] = orig_slot;
+                               btrfs_block_release(root, left_buf);
+                       }
+                       check_node(root, path, level);
+                       return 0;
+               }
+               btrfs_block_release(root, left_buf);
+       }
+       right_buf = read_node_slot(root, parent_buf, pslot + 1);
+
+       /*
+        * then try to empty the right most buffer into the middle
+        */
+       if (right_buf) {
+               u32 right_nr;
+               right = btrfs_buffer_node(right_buf);
+               right_nr = btrfs_header_nritems(&right->header);
+               if (right_nr >= BTRFS_NODEPTRS_PER_BLOCK(root) - 1) {
+                       wret = 1;
+               } else {
+                       btrfs_cow_block(trans, root, right_buf,
+                                       parent_buf, pslot + 1, &right_buf);
+                       right = btrfs_buffer_node(right_buf);
+                       wret = balance_node_right(trans, root,
+                                                 right_buf, mid_buf);
+               }
+               if (wret < 0)
+                       ret = wret;
+               if (wret == 0) {
+                       btrfs_memcpy(root, parent,
+                                    &parent->ptrs[pslot + 1].key,
+                                    &right->ptrs[0].key,
+                                    sizeof(struct btrfs_disk_key));
+                       btrfs_mark_buffer_dirty(parent_buf);
+                       if (btrfs_header_nritems(&mid->header) <= orig_slot) {
+                               path->nodes[level] = right_buf;
+                               path->slots[level + 1] += 1;
+                               path->slots[level] = orig_slot -
+                                       btrfs_header_nritems(&mid->header);
+                               btrfs_block_release(root, mid_buf);
+                       } else {
+                               btrfs_block_release(root, right_buf);
+                       }
+                       check_node(root, path, level);
+                       return 0;
+               }
+               btrfs_block_release(root, right_buf);
+       }
+       check_node(root, path, level);
+       return 1;
+}
+
 /*
  * look for key in the tree.  path is filled in with nodes along the way
  * if key is found, we return zero and you can find the item in the leaf
@@ -686,10 +805,9 @@ static int insert_new_root(struct btrfs_trans_handle *trans, struct btrfs_root
        memset(c, 0, root->blocksize);
        btrfs_set_header_nritems(&c->header, 1);
        btrfs_set_header_level(&c->header, level);
-       btrfs_set_header_blocknr(&c->header, t->b_blocknr);
+       btrfs_set_header_blocknr(&c->header, bh_blocknr(t));
        btrfs_set_header_generation(&c->header, trans->transid);
-       btrfs_set_header_parentid(&c->header,
-             btrfs_header_parentid(btrfs_buffer_header(root->node)));
+       btrfs_set_header_owner(&c->header, root->root_key.objectid);
        lower = btrfs_buffer_node(path->nodes[level-1]);
        memcpy(c->header.fsid, root->fs_info->disk_super->fsid,
               sizeof(c->header.fsid));
@@ -699,7 +817,7 @@ static int insert_new_root(struct btrfs_trans_handle *trans, struct btrfs_root
                lower_key = &lower->ptrs[0].key;
        btrfs_memcpy(root, c, &c->ptrs[0].key, lower_key,
                     sizeof(struct btrfs_disk_key));
-       btrfs_set_node_blockptr(c, 0, path->nodes[level - 1]->b_blocknr);
+       btrfs_set_node_blockptr(c, 0, bh_blocknr(path->nodes[level - 1]));
 
        btrfs_mark_buffer_dirty(t);
 
@@ -776,16 +894,24 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root
                ret = insert_new_root(trans, root, path, level + 1);
                if (ret)
                        return ret;
+       } else {
+               ret = push_nodes_for_insert(trans, root, path, level);
+               t = path->nodes[level];
+               c = btrfs_buffer_node(t);
+               if (!ret &&
+                   btrfs_header_nritems(&c->header) <
+                   BTRFS_NODEPTRS_PER_BLOCK(root) - 1)
+                       return 0;
        }
+
        c_nritems = btrfs_header_nritems(&c->header);
        split_buffer = btrfs_alloc_free_block(trans, root);
        split = btrfs_buffer_node(split_buffer);
        btrfs_set_header_flags(&split->header, btrfs_header_flags(&c->header));
        btrfs_set_header_level(&split->header, btrfs_header_level(&c->header));
-       btrfs_set_header_blocknr(&split->header, split_buffer->b_blocknr);
+       btrfs_set_header_blocknr(&split->header, bh_blocknr(split_buffer));
        btrfs_set_header_generation(&split->header, trans->transid);
-       btrfs_set_header_parentid(&split->header,
-             btrfs_header_parentid(btrfs_buffer_header(root->node)));
+       btrfs_set_header_owner(&split->header, root->root_key.objectid);
        memcpy(split->header.fsid, root->fs_info->disk_super->fsid,
               sizeof(split->header.fsid));
        mid = (c_nritems + 1) / 2;
@@ -798,7 +924,7 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root
        btrfs_mark_buffer_dirty(t);
        btrfs_mark_buffer_dirty(split_buffer);
        wret = insert_ptr(trans, root, path, &split->ptrs[0].key,
-                         split_buffer->b_blocknr, path->slots[level + 1] + 1,
+                         bh_blocknr(split_buffer), path->slots[level + 1] + 1,
                          level + 1);
        if (wret)
                ret = wret;
@@ -897,7 +1023,11 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
        }
 
        left_nritems = btrfs_header_nritems(&left->header);
-       for (i = left_nritems - 1; i >= 0; i--) {
+       if (left_nritems == 0) {
+               btrfs_block_release(root, right_buf);
+               return 1;
+       }
+       for (i = left_nritems - 1; i >= 1; i--) {
                item = left->items + i;
                if (path->slots[0] == i)
                        push_space += data_size + sizeof(*item);
@@ -911,6 +1041,8 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
                btrfs_block_release(root, right_buf);
                return 1;
        }
+       if (push_items == left_nritems)
+               WARN_ON(1);
        right_nritems = btrfs_header_nritems(&right->header);
        /* push left to right */
        push_space = btrfs_item_end(left->items + left_nritems - push_items);
@@ -947,6 +1079,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
 
        btrfs_mark_buffer_dirty(left_buf);
        btrfs_mark_buffer_dirty(right_buf);
+
        btrfs_memcpy(root, upper_node, &upper_node->ptrs[slot + 1].key,
                &right->items[0].key, sizeof(struct btrfs_disk_key));
        btrfs_mark_buffer_dirty(upper);
@@ -1008,7 +1141,12 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
                return 1;
        }
 
-       for (i = 0; i < btrfs_header_nritems(&right->header); i++) {
+       if (btrfs_header_nritems(&right->header) == 0) {
+               btrfs_block_release(root, t);
+               return 1;
+       }
+
+       for (i = 0; i < btrfs_header_nritems(&right->header) - 1; i++) {
                item = right->items + i;
                if (path->slots[0] == i)
                        push_space += data_size + sizeof(*item);
@@ -1022,6 +1160,8 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
                btrfs_block_release(root, t);
                return 1;
        }
+       if (push_items == btrfs_header_nritems(&right->header))
+               WARN_ON(1);
        /* push data from right to left */
        btrfs_memcpy(root, left, left->items +
                     btrfs_header_nritems(&left->header),
@@ -1068,7 +1208,6 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
 
        btrfs_mark_buffer_dirty(t);
        btrfs_mark_buffer_dirty(right_buf);
-
        wret = fixup_low_keys(trans, root, path, &right->items[0].key, 1);
        if (wret)
                ret = wret;
@@ -1142,11 +1281,10 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
        BUG_ON(!right_buffer);
        right = btrfs_buffer_leaf(right_buffer);
        memset(&right->header, 0, sizeof(right->header));
-       btrfs_set_header_blocknr(&right->header, right_buffer->b_blocknr);
+       btrfs_set_header_blocknr(&right->header, bh_blocknr(right_buffer));
        btrfs_set_header_generation(&right->header, trans->transid);
+       btrfs_set_header_owner(&right->header, root->root_key.objectid);
        btrfs_set_header_level(&right->header, 0);
-       btrfs_set_header_parentid(&right->header,
-             btrfs_header_parentid(btrfs_buffer_header(root->node)));
        memcpy(right->header.fsid, root->fs_info->disk_super->fsid,
               sizeof(right->header.fsid));
        if (mid <= slot) {
@@ -1158,7 +1296,7 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
                                btrfs_set_header_nritems(&right->header, 0);
                                wret = insert_ptr(trans, root, path,
                                                  &disk_key,
-                                                 right_buffer->b_blocknr,
+                                                 bh_blocknr(right_buffer),
                                                  path->slots[1] + 1, 1);
                                if (wret)
                                        ret = wret;
@@ -1179,7 +1317,7 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
                                btrfs_set_header_nritems(&right->header, 0);
                                wret = insert_ptr(trans, root, path,
                                                  &disk_key,
-                                                 right_buffer->b_blocknr,
+                                                 bh_blocknr(right_buffer),
                                                  path->slots[1] - 1, 1);
                                if (wret)
                                        ret = wret;
@@ -1187,6 +1325,12 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
                                path->nodes[0] = right_buffer;
                                path->slots[0] = 0;
                                path->slots[1] -= 1;
+                               if (path->slots[1] == 0) {
+                                       wret = fixup_low_keys(trans, root,
+                                                  path, &disk_key, 1);
+                                       if (wret)
+                                               ret = wret;
+                               }
                                return ret;
                        }
                        mid = slot;
@@ -1213,7 +1357,7 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
        btrfs_set_header_nritems(&l->header, mid);
        ret = 0;
        wret = insert_ptr(trans, root, path, &right->items[0].key,
-                         right_buffer->b_blocknr, path->slots[1] + 1, 1);
+                         bh_blocknr(right_buffer), path->slots[1] + 1, 1);
        if (wret)
                ret = wret;
        btrfs_mark_buffer_dirty(right_buffer);
@@ -1234,21 +1378,25 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
        BUG_ON(!right_buffer);
        right = btrfs_buffer_leaf(right_buffer);
        memset(&right->header, 0, sizeof(right->header));
-       btrfs_set_header_blocknr(&right->header, right_buffer->b_blocknr);
+       btrfs_set_header_blocknr(&right->header, bh_blocknr(right_buffer));
        btrfs_set_header_generation(&right->header, trans->transid);
+       btrfs_set_header_owner(&right->header, root->root_key.objectid);
        btrfs_set_header_level(&right->header, 0);
-       btrfs_set_header_parentid(&right->header,
-             btrfs_header_parentid(btrfs_buffer_header(root->node)));
        memcpy(right->header.fsid, root->fs_info->disk_super->fsid,
               sizeof(right->header.fsid));
        btrfs_cpu_key_to_disk(&disk_key, ins_key);
        btrfs_set_header_nritems(&right->header, 0);
        wret = insert_ptr(trans, root, path,
                          &disk_key,
-                         right_buffer->b_blocknr,
+                         bh_blocknr(right_buffer),
                          path->slots[1], 1);
        if (wret)
                ret = wret;
+       if (path->slots[1] == 0) {
+               wret = fixup_low_keys(trans, root, path, &disk_key, 1);
+               if (wret)
+                       ret = wret;
+       }
        btrfs_block_release(root, path->nodes[0]);
        path->nodes[0] = right_buffer;
        path->slots[0] = 0;
@@ -1257,6 +1405,116 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
        return ret;
 }
 
+int btrfs_truncate_item(struct btrfs_trans_handle *trans,
+                       struct btrfs_root *root,
+                       struct btrfs_path *path,
+                       u32 new_size)
+{
+       int ret = 0;
+       int slot;
+       int slot_orig;
+       struct btrfs_leaf *leaf;
+       struct buffer_head *leaf_buf;
+       u32 nritems;
+       unsigned int data_end;
+       unsigned int old_data_start;
+       unsigned int old_size;
+       unsigned int size_diff;
+       int i;
+
+       slot_orig = path->slots[0];
+       leaf_buf = path->nodes[0];
+       leaf = btrfs_buffer_leaf(leaf_buf);
+
+       nritems = btrfs_header_nritems(&leaf->header);
+       data_end = leaf_data_end(root, leaf);
+
+       slot = path->slots[0];
+       old_data_start = btrfs_item_offset(leaf->items + slot);
+       old_size = btrfs_item_size(leaf->items + slot);
+       BUG_ON(old_size <= new_size);
+       size_diff = old_size - new_size;
+
+       BUG_ON(slot < 0);
+       BUG_ON(slot >= nritems);
+
+       /*
+        * item0..itemN ... dataN.offset..dataN.size .. data0.size
+        */
+       /* first correct the data pointers */
+       for (i = slot; i < nritems; i++) {
+               u32 ioff = btrfs_item_offset(leaf->items + i);
+               btrfs_set_item_offset(leaf->items + i,
+                                     ioff + size_diff);
+       }
+       /* shift the data */
+       btrfs_memmove(root, leaf, btrfs_leaf_data(leaf) +
+                     data_end + size_diff, btrfs_leaf_data(leaf) +
+                     data_end, old_data_start + new_size - data_end);
+       btrfs_set_item_size(leaf->items + slot, new_size);
+       btrfs_mark_buffer_dirty(leaf_buf);
+
+       ret = 0;
+       if (btrfs_leaf_free_space(root, leaf) < 0)
+               BUG();
+       check_leaf(root, path, 0);
+       return ret;
+}
+
+int btrfs_extend_item(struct btrfs_trans_handle *trans, struct btrfs_root
+                     *root, struct btrfs_path *path, u32 data_size)
+{
+       int ret = 0;
+       int slot;
+       int slot_orig;
+       struct btrfs_leaf *leaf;
+       struct buffer_head *leaf_buf;
+       u32 nritems;
+       unsigned int data_end;
+       unsigned int old_data;
+       unsigned int old_size;
+       int i;
+
+       slot_orig = path->slots[0];
+       leaf_buf = path->nodes[0];
+       leaf = btrfs_buffer_leaf(leaf_buf);
+
+       nritems = btrfs_header_nritems(&leaf->header);
+       data_end = leaf_data_end(root, leaf);
+
+       if (btrfs_leaf_free_space(root, leaf) < data_size)
+               BUG();
+       slot = path->slots[0];
+       old_data = btrfs_item_end(leaf->items + slot);
+
+       BUG_ON(slot < 0);
+       BUG_ON(slot >= nritems);
+
+       /*
+        * item0..itemN ... dataN.offset..dataN.size .. data0.size
+        */
+       /* first correct the data pointers */
+       for (i = slot; i < nritems; i++) {
+               u32 ioff = btrfs_item_offset(leaf->items + i);
+               btrfs_set_item_offset(leaf->items + i,
+                                     ioff - data_size);
+       }
+       /* shift the data */
+       btrfs_memmove(root, leaf, btrfs_leaf_data(leaf) +
+                     data_end - data_size, btrfs_leaf_data(leaf) +
+                     data_end, old_data - data_end);
+       data_end = old_data;
+       old_size = btrfs_item_size(leaf->items + slot);
+       btrfs_set_item_size(leaf->items + slot, old_size + data_size);
+       btrfs_mark_buffer_dirty(leaf_buf);
+
+       ret = 0;
+       if (btrfs_leaf_free_space(root, leaf) < 0)
+               BUG();
+       check_leaf(root, path, 0);
+       return ret;
+}
+
 /*
  * Given a key and some data, insert an item into the tree.
  * This does all the path init required, making room in the tree if needed.
@@ -1464,7 +1722,7 @@ int btrfs_del_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                        if (wret)
                                ret = wret;
                        wret = btrfs_free_extent(trans, root,
-                                                leaf_buf->b_blocknr, 1, 1);
+                                                bh_blocknr(leaf_buf), 1, 1);
                        if (wret)
                                ret = wret;
                }
@@ -1495,7 +1753,7 @@ int btrfs_del_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                                        ret = wret;
                        }
                        if (btrfs_header_nritems(&leaf->header) == 0) {
-                               u64 blocknr = leaf_buf->b_blocknr;
+                               u64 blocknr = bh_blocknr(leaf_buf);
                                clean_tree_block(trans, root, leaf_buf);
                                wait_on_buffer(leaf_buf);
                                wret = del_ptr(trans, root, path, 1, slot);
This page took 0.054289 seconds and 5 git commands to generate.