diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-05-10 10:13:23 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-05-10 10:13:23 +0100 |
commit | 58e631d01823afd60e52f3a09887f270a91889a0 (patch) | |
tree | 6afbca5492c1ad1040608e01fe0c9d909482adeb /extent-tree.c | |
parent | cec572daccafa1e912cbed363df6f84687778c6f (diff) |
New upstream release 4.5.2.
* Thanks for NMU of package rename.
* New upstream release 4.5.2.
* Upload using dgit.
* Source-only upload.
* btrfs-convert should not be included in the initramfs, but should be
compiled. Using btrfs-convert is not a trivial operation, and
especially not from a minimal shell. Also it is known to fail, and for
a sophisticated user it is trivial to include it in the
initramfs. Thus won't fix Closes: #801192
* No sponsorship required Closes: #823474
* Add Provides btrfs-tools-udeb to the -progs-udeb package.
Diffstat (limited to 'extent-tree.c')
-rw-r--r-- | extent-tree.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/extent-tree.c b/extent-tree.c index b9b00f06..4a41717e 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -153,7 +153,7 @@ static int cache_block_group(struct btrfs_root *root, GFP_NOFS); } if (key.type == BTRFS_METADATA_ITEM_KEY) - last = key.objectid + root->leafsize; + last = key.objectid + root->nodesize; else last = key.objectid + key.offset; } @@ -1458,7 +1458,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, if (metadata && !btrfs_fs_incompat(root->fs_info, BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA)) { - offset = root->leafsize; + offset = root->nodesize; metadata = 0; } @@ -1493,14 +1493,14 @@ again: path->slots[0]); if (key.objectid == bytenr && key.type == BTRFS_EXTENT_ITEM_KEY && - key.offset == root->leafsize) + key.offset == root->nodesize) ret = 0; } if (ret) { btrfs_release_path(path); key.type = BTRFS_EXTENT_ITEM_KEY; - key.offset = root->leafsize; + key.offset = root->nodesize; metadata = 0; goto again; } @@ -1565,7 +1565,7 @@ int btrfs_set_block_flags(struct btrfs_trans_handle *trans, key.offset = level; key.type = BTRFS_METADATA_ITEM_KEY; } else { - key.offset = root->leafsize; + key.offset = root->nodesize; key.type = BTRFS_EXTENT_ITEM_KEY; } @@ -1582,13 +1582,13 @@ again: btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]); if (key.objectid == bytenr && - key.offset == root->leafsize && + key.offset == root->nodesize && key.type == BTRFS_EXTENT_ITEM_KEY) ret = 0; } if (ret) { btrfs_release_path(path); - key.offset = root->leafsize; + key.offset = root->nodesize; key.type = BTRFS_EXTENT_ITEM_KEY; goto again; } @@ -1686,7 +1686,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, } } else { bytenr = btrfs_node_blockptr(buf, i); - num_bytes = btrfs_level_size(root, level - 1); + num_bytes = root->nodesize; ret = process_func(trans, root, bytenr, num_bytes, parent, ref_root, level - 1, 0); if (ret) { @@ -2750,7 +2750,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, btrfs_mark_buffer_dirty(leaf); btrfs_free_path(path); - ret = update_block_group(trans, root, ins->objectid, root->leafsize, + ret = update_block_group(trans, root, ins->objectid, root->nodesize, 1, 0); return ret; } @@ -3897,9 +3897,9 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, key.objectid, key.offset, 1, 0); BUG_ON(ret); } else if (key.type == BTRFS_METADATA_ITEM_KEY) { - bytes_used += root->leafsize; + bytes_used += root->nodesize; ret = btrfs_update_block_group(trans, root, - key.objectid, root->leafsize, 1, 0); + key.objectid, root->nodesize, 1, 0); BUG_ON(ret); } path.slots[0]++; |