btrfs: Various changes for the mixed back reference #2
PATCH 4/6 btrfs: Various changes for the mixed back reference #2
This patch contain various changes for the mixed back reference. Most changes are involved in updating function parameters.
Signed-off-by Yan Zheng <[email protected]>
---
fs/btrfs/ctree.c +135 -162
@@ -197,14 +197,7 @@ int btrfs_copy_root(struct btrfs_trans_hu32 nritems;int ret =0 ;int level; -struct btrfs_root *new_root; - - new_root =kmalloc (sizeof (*new_root),GFP_NOFS ); -if (!new_root) -return -ENOMEM ; - -memcpy (new_root, root,sizeof (*new_root)); - new_root->root_key.objectid = new_root_objectid; +struct btrfs_disk_key disk_key;WARN_ON (root->ref_cows && trans->transid != root->fs_info->running_transaction->transid);
@@ -212,28 +205,33 @@ int btrfs_copy_root(struct btrfs_trans_h level =btrfs_header_level (buf); nritems =btrfs_header_nritems (buf); +if (level ==0 ) +btrfs_item_key (buf, &disk_key,0 ); +else +btrfs_node_key (buf, &disk_key,0 ); - cow =btrfs_alloc_free_block (trans, new_root, buf->len,0 , - new_root_objectid, trans->transid, - level, buf->start,0 ); -if (IS_ERR (cow)) { -kfree (new_root); + cow =btrfs_alloc_free_block (trans, root, buf->len,0 , + new_root_objectid, &disk_key, level, + buf->start,0 ); +if (IS_ERR (cow))return PTR_ERR (cow); - }copy_extent_buffer (cow, buf,0 ,0 , cow->len);btrfs_set_header_bytenr (cow, cow->start);btrfs_set_header_generation (cow, trans->transid); -btrfs_set_header_owner (cow, new_root_objectid); +btrfs_set_header_backref_rev (cow,BTRFS_MIXED_BACKREF_REV );btrfs_clear_header_flag (cow,BTRFS_HEADER_FLAG_WRITTEN ); +btrfs_set_header_owner (cow, new_root_objectid);write_extent_buffer (cow, root->fs_info->fsid, (unsigned long )btrfs_header_fsid (cow),BTRFS_FSID_SIZE );WARN_ON (btrfs_header_generation (buf) > trans->transid); - ret =btrfs_inc_ref (trans, new_root, buf, cow,NULL ); -kfree (new_root); +if (new_root_objectid ==BTRFS_TREE_RELOC_OBJECTID ) + ret =btrfs_inc_ref (trans, root, cow,1 ); +else + ret =btrfs_inc_ref (trans, root, cow,0 );if (ret)return ret;
@@ -563,7 +561,7 @@ static int comp_keys(struct btrfs_disk_k/* * same as comp_keys only with two btrfs_key's */ -static int comp_cpu_keys (struct btrfs_key *k1,struct btrfs_key *k2) +int btrfs_comp_cpu_keys (struct btrfs_key *k1,struct btrfs_key *k2) {if (k1->objectid > k2->objectid)return 1 ;
@@ -939,6 +937,12 @@ static int bin_search(struct extent_buffreturn -1 ; } +int btrfs_bin_search (struct extent_buffer *eb,struct btrfs_key *key, +int level,int *slot) +{ +return bin_search (eb, key, level, slot); +} +/* given a node and slot number, this reads the blocks it points to. The * extent buffer is returned with a reference taken (but unlocked). * NULL is returned on error.
@@ -1015,13 +1019,6 @@ static noinline int balance_level(struct root->node = child;spin_unlock (&root->node_lock); - ret =btrfs_update_extent_ref (trans, root, child->start, - child->len, - mid->start, child->start, - root->root_key.objectid, - trans->transid, level -1 ); -BUG_ON (ret); -add_root_to_dirty_list (root);btrfs_tree_unlock (child);
@@ -1032,9 +1029,7 @@ static noinline int balance_level(struct/* once for the path */ free_extent_buffer (mid); ret =btrfs_free_extent (trans, root, mid->start, mid->len, - mid->start, root->root_key.objectid, -btrfs_header_generation (mid), - level,1 ); +0 , root->root_key.objectid, level,1 );/* once for the root ptr */ free_extent_buffer (mid);return ret;
@@ -1092,7 +1087,6 @@ static noinline int balance_level(struct ret = wret;if (btrfs_header_nritems (right) ==0 ) {u64 bytenr = right->start; -u64 generation =btrfs_header_generation (parent);u32 blocksize = right->len;clean_tree_block (trans, root, right);
@@ -1104,9 +1098,9 @@ static noinline int balance_level(structif (wret) ret = wret; wret =btrfs_free_extent (trans, root, bytenr, - blocksize, parent->start, -btrfs_header_owner (parent), - generation, level,1 ); + blocksize,0 , + root->root_key.objectid, + level,0 );if (wret) ret = wret; }else {
@@ -1141,7 +1135,6 @@ static noinline int balance_level(struct }if (btrfs_header_nritems (mid) ==0 ) {/* we've managed to empty the middle node, drop it */ -u64 root_gen =btrfs_header_generation (parent);u64 bytenr = mid->start;u32 blocksize = mid->len;
@@ -1153,9 +1146,8 @@ static noinline int balance_level(structif (wret) ret = wret; wret =btrfs_free_extent (trans, root, bytenr, blocksize, - parent->start, -btrfs_header_owner (parent), - root_gen, level,1 ); +0 , root->root_key.objectid, + level,0 );if (wret) ret = wret; }else {
@@ -1531,7 +1523,7 @@ noinline void btrfs_unlock_up_safe(struc {int i; -if (path->keep_locks || path->lowest_level) +if (path->keep_locks)return ;for (i = level; i <BTRFS_MAX_LEVEL ; i++) {
@@ -1708,10 +1700,17 @@ int btrfs_search_slot(struct btrfs_trans lowest_unlock =2 ; again: -if (p->skip_locking) - b =btrfs_root_node (root); -else - b =btrfs_lock_root_node (root); +if (p->search_commit_root) { + b = root->commit_root; +extent_buffer_get (b); +if (!p->skip_locking) +btrfs_tree_lock (b); + }else { +if (p->skip_locking) + b =btrfs_root_node (root); +else + b =btrfs_lock_root_node (root); + }while (b) { level =btrfs_header_level (b);
@@ -2113,9 +2112,6 @@ static int push_node_left(struct btrfs_tbtrfs_mark_buffer_dirty (src);btrfs_mark_buffer_dirty (dst); - ret =btrfs_update_ref (trans, root, src, dst, dst_nritems, push_items); -BUG_ON (ret); -return ret; }
@@ -2175,9 +2171,6 @@ static int balance_node_right(struct btrbtrfs_mark_buffer_dirty (src);btrfs_mark_buffer_dirty (dst); - ret =btrfs_update_ref (trans, root, src, dst,0 , push_items); -BUG_ON (ret); -return ret; }
@@ -2197,7 +2190,6 @@ static noinline int insert_new_root(strustruct extent_buffer *c;struct extent_buffer *old;struct btrfs_disk_key lower_key; -int ret;BUG_ON (path->nodes[level]);BUG_ON (path->nodes[level-1 ] != root->node);
@@ -2209,16 +2201,17 @@ static noinline int insert_new_root(strubtrfs_node_key (lower, &lower_key,0 ); c =btrfs_alloc_free_block (trans, root, root->nodesize,0 , - root->root_key.objectid, trans->transid, + root->root_key.objectid, &lower_key, level, root->node->start,0 );if (IS_ERR (c))return PTR_ERR (c); -memset_extent_buffer (c,0 ,0 , root->nodesize); +memset_extent_buffer (c,0 ,0 ,sizeof (struct btrfs_header ));btrfs_set_header_nritems (c,1 );btrfs_set_header_level (c, level);btrfs_set_header_bytenr (c, c->start);btrfs_set_header_generation (c, trans->transid); +btrfs_set_header_backref_rev (c,BTRFS_MIXED_BACKREF_REV );btrfs_set_header_owner (c, root->root_key.objectid); write_extent_buffer(c, root->fs_info->fsid,
@@ -2243,12 +2236,6 @@ static noinline int insert_new_root(stru root->node = c;spin_unlock (&root->node_lock); - ret =btrfs_update_extent_ref (trans, root, lower->start, - lower->len, lower->start, c->start, - root->root_key.objectid, - trans->transid, level -1 ); -BUG_ON (ret); -/* the super has an extra ref to root->node */ free_extent_buffer (old);
@@ -2336,20 +2323,21 @@ static noinline int split_node(struct bt } c_nritems =btrfs_header_nritems (c); + mid = (c_nritems +1 ) /2 ; +btrfs_node_key (c, &disk_key, mid); - split =btrfs_alloc_free_block (trans, root, root->nodesize, - path->nodes[level +1 ]->start, + split =btrfs_alloc_free_block (trans, root, root->nodesize,0 , root->root_key.objectid, - trans->transid, level, c->start,0 ); + &disk_key, level, c->start,0 );if (IS_ERR (split))return PTR_ERR (split); -btrfs_set_header_flags (split,btrfs_header_flags (c)); +memset_extent_buffer (split,0 ,0 ,sizeof (struct btrfs_header ));btrfs_set_header_level (split,btrfs_header_level (c));btrfs_set_header_bytenr (split, split->start);btrfs_set_header_generation (split, trans->transid); +btrfs_set_header_backref_rev (split,BTRFS_MIXED_BACKREF_REV );btrfs_set_header_owner (split, root->root_key.objectid); -btrfs_set_header_flags (split,0 );write_extent_buffer (split, root->fs_info->fsid, (unsigned long )btrfs_header_fsid (split),BTRFS_FSID_SIZE );
@@ -2357,7 +2345,6 @@ static noinline int split_node(struct bt (unsigned long )btrfs_header_chunk_tree_uuid (split), BTRFS_UUID_SIZE); - mid = (c_nritems +1 ) /2 ; copy_extent_buffer(split, c, btrfs_node_key_ptr_offset(0),
@@ -2370,16 +2357,12 @@ static noinline int split_node(struct btbtrfs_mark_buffer_dirty (c);btrfs_mark_buffer_dirty (split); -btrfs_node_key (split, &disk_key,0 ); wret =insert_ptr (trans, root, path, &disk_key, split->start, path->slots[level +1 ] +1 , level +1 );if (wret) ret = wret; - ret =btrfs_update_ref (trans, root, c, split,0 , c_nritems - mid); -BUG_ON (ret); -if (path->slots[level] >= mid) { path->slots[level] -= mid;btrfs_tree_unlock (c);
@@ -2452,7 +2435,6 @@ static noinline int __push_leaf_right(stu32 right_nritems;u32 data_end;u32 this_item_size; -int ret;if (empty) nr =0 ;
@@ -2565,9 +2547,6 @@ static noinline int __push_leaf_right(stbtrfs_mark_buffer_dirty (left);btrfs_mark_buffer_dirty (right); - ret =btrfs_update_ref (trans, root, left, right,0 , push_items); -BUG_ON (ret); -btrfs_item_key (right, &disk_key,0 );btrfs_set_node_key (upper, &disk_key, slot +1 );btrfs_mark_buffer_dirty (upper);
@@ -2812,10 +2791,6 @@ static noinline int __push_leaf_left(strif (right_nritems)btrfs_mark_buffer_dirty (right); - ret =btrfs_update_ref (trans, root, right, left, - old_left_nritems, push_items); -BUG_ON (ret); -btrfs_item_key (right, &disk_key,0 ); wret =fixup_low_keys (trans, root, path, &disk_key,1 );if (wret)
@@ -2972,9 +2947,6 @@ static noinline int copy_for_split(strucbtrfs_mark_buffer_dirty (l);BUG_ON (path->slots[0 ] != slot); - ret =btrfs_update_ref (trans, root, l, right,0 , nritems); -BUG_ON (ret); -if (mid <= slot) {btrfs_tree_unlock (path->nodes[0 ]);free_extent_buffer (path->nodes[0 ]);
@@ -3003,6 +2975,7 @@ static noinline int split_leaf(struct bt struct btrfs_path *path, int data_size, int extend) { + struct btrfs_disk_key disk_key;struct extent_buffer *l;u32 nritems;int mid;
@@ -3010,7 +2983,7 @@ static noinline int split_leaf(struct btstruct extent_buffer *right;int ret =0 ;int wret; -int double_split; +int split;int num_doubles =0 ;/* first try to make some room by pushing left and right */
@@ -3037,16 +3010,53 @@ static noinline int split_leaf(struct btreturn ret; } again: - double_split =0 ; + split =1 ; l = path->nodes[0 ]; slot = path->slots[0 ]; nritems =btrfs_header_nritems (l); mid = (nritems +1 ) /2 ; - right =btrfs_alloc_free_block (trans, root, root->leafsize, - path->nodes[1 ]->start, +if (mid <= slot) { +if (nritems ==1 || +leaf_space_used (l, mid, nritems - mid) + data_size > +BTRFS_LEAF_DATA_SIZE (root)) { +if (slot >= nritems) { + split =0 ; + }else { + mid = slot; +if (mid != nritems && +leaf_space_used (l, mid, nritems - mid) + + data_size >BTRFS_LEAF_DATA_SIZE (root)) { + split =2 ; + } + } + } + }else { +if (leaf_space_used (l,0 , mid) + data_size > +BTRFS_LEAF_DATA_SIZE (root)) { +if (!extend && data_size && slot ==0 ) { + split =0 ; + }else if ((extend || !data_size) && slot ==0 ) { + mid =1 ; + }else { + mid = slot; +if (mid != nritems && +leaf_space_used (l, mid, nritems - mid) + + data_size >BTRFS_LEAF_DATA_SIZE (root)) { + split =2 ; + } + } + } + } + +if (split ==0 ) +btrfs_cpu_key_to_disk (&disk_key, ins_key); +else +btrfs_item_key (l, &disk_key, mid); + + right =btrfs_alloc_free_block (trans, root, root->leafsize,0 , root->root_key.objectid, - trans->transid,0 , l->start,0 ); + &disk_key,0 , l->start,0 );if (IS_ERR (right)) {BUG_ON (1 );return PTR_ERR (right);
@@ -3055,6 +3065,7 @@ again:memset_extent_buffer (right,0 ,0 ,sizeof (struct btrfs_header ));btrfs_set_header_bytenr (right, right->start);btrfs_set_header_generation (right, trans->transid); +btrfs_set_header_backref_rev (right,BTRFS_MIXED_BACKREF_REV );btrfs_set_header_owner (right, root->root_key.objectid);btrfs_set_header_level (right,0 ); write_extent_buffer(right, root->fs_info->fsid,
@@ -3065,79 +3076,47 @@ again: (unsigned long )btrfs_header_chunk_tree_uuid (right), BTRFS_UUID_SIZE); -if (mid <= slot) { -if (nritems ==1 || -leaf_space_used (l, mid, nritems - mid) + data_size > -BTRFS_LEAF_DATA_SIZE (root)) { -if (slot >= nritems) { -struct btrfs_disk_key disk_key; - -btrfs_cpu_key_to_disk (&disk_key, ins_key); -btrfs_set_header_nritems (right,0 ); - wret =insert_ptr (trans, root, path, - &disk_key, right->start, - path->slots[1 ] +1 ,1 ); -if (wret) - ret = wret; - -btrfs_tree_unlock (path->nodes[0 ]); -free_extent_buffer (path->nodes[0 ]); - path->nodes[0 ] = right; - path->slots[0 ] =0 ; - path->slots[1 ] +=1 ; -btrfs_mark_buffer_dirty (right); -return ret; - } - mid = slot; -if (mid != nritems && -leaf_space_used (l, mid, nritems - mid) + - data_size >BTRFS_LEAF_DATA_SIZE (root)) { - double_split =1 ; - } - } - }else { -if (leaf_space_used (l,0 , mid) + data_size > -BTRFS_LEAF_DATA_SIZE (root)) { -if (!extend && data_size && slot ==0 ) { -struct btrfs_disk_key disk_key; +if (split ==0 ) { +if (mid <= slot) { +btrfs_set_header_nritems (right,0 ); + wret =insert_ptr (trans, root, path, + &disk_key, right->start, + path->slots[1 ] +1 ,1 ); +if (wret) + ret = wret; -btrfs_cpu_key_to_disk (&disk_key, ins_key); -btrfs_set_header_nritems (right,0 ); - wret =insert_ptr (trans, root, path, - &disk_key, - right->start, - path->slots[1 ],1 ); +btrfs_tree_unlock (path->nodes[0 ]); +free_extent_buffer (path->nodes[0 ]); + path->nodes[0 ] = right; + path->slots[0 ] =0 ; + path->slots[1 ] +=1 ; + }else { +btrfs_set_header_nritems (right,0 ); + wret =insert_ptr (trans, root, path, + &disk_key, + right->start, + path->slots[1 ],1 ); +if (wret) + ret = wret; +btrfs_tree_unlock (path->nodes[0 ]); +free_extent_buffer (path->nodes[0 ]); + path->nodes[0 ] = right; + path->slots[0 ] =0 ; +if (path->slots[1 ] ==0 ) { + wret =fixup_low_keys (trans, root, + path, &disk_key,1 );if (wret) ret = wret; -btrfs_tree_unlock (path->nodes[0 ]); -free_extent_buffer (path->nodes[0 ]); - path->nodes[0 ] = right; - path->slots[0 ] =0 ; -if (path->slots[1 ] ==0 ) { - wret =fixup_low_keys (trans, root, - path, &disk_key,1 ); -if (wret) - ret = wret; - } -btrfs_mark_buffer_dirty (right); -return ret; - }else if ((extend || !data_size) && slot ==0 ) { - mid =1 ; - }else { - mid = slot; -if (mid != nritems && -leaf_space_used (l, mid, nritems - mid) + - data_size >BTRFS_LEAF_DATA_SIZE (root)) { - double_split =1 ; - } } } +btrfs_mark_buffer_dirty (right); +return ret; } ret =copy_for_split (trans, root, path, l, right, slot, mid, nritems);BUG_ON (ret); -if (double_split) { +if (split ==2 ) {BUG_ON (num_doubles !=0 ); num_doubles++; goto again;
@@ -3539,7 +3518,7 @@ int btrfs_insert_some_items(struct btrfs/* figure out how many keys we can insert in here */ total_data = data_size[0 ];for (i =1 ; i < nr; i++) { -if (comp_cpu_keys (&found_key, cpu_key + i) <=0 ) +if (btrfs_comp_cpu_keys (&found_key, cpu_key + i) <=0 )break ; total_data += data_size[i]; }
@@ -3837,9 +3816,7 @@ static int del_ptr(struct btrfs_trans_ha/* * a helper function to delete the leaf pointed to by path->slots[1] and -* path->nodes[1]. bytenr is the node block pointer, but since the callers -* already know it, it is faster to have them pass it down than to -* read it out of the node again. +* path->nodes[1]. * * This deletes the pointer in path->nodes[1] and frees the leaf * block extent. zero is returned if it all worked out, < 0 otherwise.
@@ -3847,15 +3824,14 @@ static int del_ptr(struct btrfs_trans_ha* The path must have already been setup for deleting the leaf, including * all the proper balancing. path->nodes[1] must be locked. */ -noinline int btrfs_del_leaf(struct btrfs_trans_handle *trans, -struct btrfs_root *root, -struct btrfs_path *path,u64 bytenr) +static noinline int btrfs_del_leaf(struct btrfs_trans_handle *trans, +struct btrfs_root *root, +struct btrfs_path *path, +struct extent_buffer *leaf) {int ret; -u64 root_gen =btrfs_header_generation (path->nodes[1 ]); -u64 parent_start = path->nodes[1 ]->start; -u64 parent_owner =btrfs_header_owner (path->nodes[1 ]); +WARN_ON (btrfs_header_generation (leaf) != trans->transid); ret =del_ptr (trans, root, path,1 , path->slots[1 ]);if (ret)return ret;
@@ -3866,10 +3842,8 @@ noinline int btrfs_del_leaf(struct btrfs*/ btrfs_unlock_up_safe (path,0 ); - ret =btrfs_free_extent (trans, root, bytenr, -btrfs_level_size (root,0 ), - parent_start, parent_owner, - root_gen,0 ,1 ); + ret =btrfs_free_extent (trans, root, leaf->start, leaf->len, +0 , root->root_key.objectid,0 ,0 );return ret; }/*
@@ -3937,7 +3911,7 @@ int btrfs_del_items(struct btrfs_trans_hif (leaf == root->node) {btrfs_set_header_level (leaf,0 ); }else { - ret =btrfs_del_leaf (trans, root, path, leaf->start); + ret =btrfs_del_leaf (trans, root, path, leaf);BUG_ON (ret); } }else {
@@ -3976,8 +3950,7 @@ int btrfs_del_items(struct btrfs_trans_hif (btrfs_header_nritems (leaf) ==0 ) { path->slots[1 ] = slot; - ret =btrfs_del_leaf (trans, root, path, - leaf->start); + ret =btrfs_del_leaf (trans, root, path, leaf);BUG_ON (ret);free_extent_buffer (leaf); }else {
fs/btrfs/file.c +22 -54
188 lines not on this page · raw message
fs/btrfs/inode.c +16 -14
@@ -48,7 +48,6 @@#include "ordered-data.h" #include "xattr.h" #include "tree-log.h" -#include "ref-cache.h" #include "compression.h" #include "locking.h"
@@ -944,6 +943,7 @@ static noinline int run_delalloc_nocow(su64 cow_start;u64 cur_offset;u64 extent_end; +u64 extent_offset;u64 disk_bytenr;u64 num_bytes;int extent_type;
@@ -1005,6 +1005,7 @@ next_slot:if (extent_type ==BTRFS_FILE_EXTENT_REG || extent_type ==BTRFS_FILE_EXTENT_PREALLOC ) { disk_bytenr =btrfs_file_extent_disk_bytenr (leaf, fi); + extent_offset =btrfs_file_extent_offset (leaf, fi); extent_end = found_key.offset +btrfs_file_extent_num_bytes (leaf, fi);if (extent_end <= start) {
@@ -1022,9 +1023,10 @@ next_slot:if (btrfs_extent_readonly (root, disk_bytenr)) goto out_check;if (btrfs_cross_ref_exist (trans, root, inode->i_ino, - disk_bytenr)) + found_key.offset - + extent_offset, disk_bytenr)) goto out_check; - disk_bytenr +=btrfs_file_extent_offset (leaf, fi); + disk_bytenr += extent_offset; disk_bytenr += cur_offset - found_key.offset; num_bytes =min (end +1 , extent_end) - cur_offset;/*
@@ -1489,9 +1491,9 @@ static int insert_reserved_file_extent(s ins.objectid = disk_bytenr; ins.offset = disk_num_bytes; ins.type =BTRFS_EXTENT_ITEM_KEY ; - ret =btrfs_alloc_reserved_extent (trans, root, leaf->start, - root->root_key.objectid, - trans->transid, inode->i_ino, &ins); + ret =btrfs_alloc_reserved_file_extent (trans, root, + root->root_key.objectid, + inode->i_ino, file_pos, &ins);BUG_ON (ret);btrfs_free_path (path);
@@ -2599,9 +2601,8 @@ noinline int btrfs_truncate_inode_items(struct btrfs_file_extent_item *fi;u64 extent_start =0 ;u64 extent_num_bytes =0 ; +u64 extent_offset =0 ;u64 item_end =0 ; -u64 root_gen =0 ; -u64 root_owner =0 ;int found_extent;int del_item;int pending_del_nr =0 ;
@@ -2716,6 +2717,9 @@ search_again: extent_num_bytes =btrfs_file_extent_disk_num_bytes (leaf, fi); + extent_offset = found_key.offset - +btrfs_file_extent_offset (leaf, fi); +/* FIXME blocksize != 4096 */ num_dec =btrfs_file_extent_num_bytes (leaf, fi);if (extent_start !=0 ) {
@@ -2723,8 +2727,6 @@ search_again:if (root->ref_cows)inode_sub_bytes (inode, num_dec); } - root_gen =btrfs_header_generation (leaf); - root_owner =btrfs_header_owner (leaf); } }else if (extent_type ==BTRFS_FILE_EXTENT_INLINE ) {/*
@@ -2768,12 +2770,12 @@ delete: }else {break ; } -if (found_extent) { +if (found_extent && root->ref_cows) {btrfs_set_path_blocking (path); ret =btrfs_free_extent (trans, root, extent_start, - extent_num_bytes, - leaf->start, root_owner, - root_gen, inode->i_ino,0 ); + extent_num_bytes,0 , +btrfs_header_owner (leaf), + inode->i_ino, extent_offset);BUG_ON (ret); } next:
fs/btrfs/ioctl.c +12 -9
@@ -82,22 +82,25 @@ static noinline int create_subvol(structif (ret) goto fail; - leaf =btrfs_alloc_free_block (trans, root, root->leafsize,0 , - objectid, trans->transid,0 ,0 ,0 ); + leaf =btrfs_alloc_free_block (trans, root, root->leafsize, +0 , objectid,NULL ,0 ,0 ,0 );if (IS_ERR (leaf)) { ret =PTR_ERR (leaf); goto fail; } -btrfs_set_header_nritems (leaf,0 ); -btrfs_set_header_level (leaf,0 ); +memset_extent_buffer (leaf,0 ,0 ,sizeof (struct btrfs_header ));btrfs_set_header_bytenr (leaf, leaf->start);btrfs_set_header_generation (leaf, trans->transid); +btrfs_set_header_backref_rev (leaf,BTRFS_MIXED_BACKREF_REV );btrfs_set_header_owner (leaf, objectid);write_extent_buffer (leaf, root->fs_info->fsid, (unsigned long )btrfs_header_fsid (leaf),BTRFS_FSID_SIZE ); +write_extent_buffer (leaf, root->fs_info->chunk_tree_uuid, + (unsigned long )btrfs_header_chunk_tree_uuid (leaf), +BTRFS_UUID_SIZE );btrfs_mark_buffer_dirty (leaf); inode_item = &root_item.inode;
@@ -125,7 +128,7 @@ static noinline int create_subvol(structbtrfs_set_root_dirid (&root_item, new_dirid); key.objectid = objectid; - key.offset =1 ; + key.offset =0 ;btrfs_set_key_type (&key,BTRFS_ROOT_ITEM_KEY ); ret =btrfs_insert_root (trans, root->fs_info->tree_root, &key, &root_item);
@@ -936,10 +939,10 @@ static long btrfs_ioctl_clone(struct filif (disko) {inode_add_bytes (inode, datal); ret =btrfs_inc_extent_ref (trans, root, - disko, diskl, leaf->start, - root->root_key.objectid, - trans->transid, - inode->i_ino); + disko, diskl,0 , + root->root_key.objectid, + inode->i_ino, + new_key.offset - datao);BUG_ON (ret); } }else if (type ==BTRFS_FILE_EXTENT_INLINE ) {
fs/btrfs/print-tree.c +138 -17
186 lines not on this page · raw message
fs/btrfs/tree-log.c +36 -66
188 lines not on this page · raw message