diff options
-rw-r--r-- | fs/btrfs/ctree.c | 3 | ||||
-rw-r--r-- | fs/btrfs/ctree.h | 3 | ||||
-rw-r--r-- | fs/btrfs/dir-item.c | 2 | ||||
-rw-r--r-- | fs/btrfs/extent-tree.c | 4 | ||||
-rw-r--r-- | fs/btrfs/file-item.c | 2 | ||||
-rw-r--r-- | fs/btrfs/inode-item.c | 4 | ||||
-rw-r--r-- | fs/btrfs/tree-log.c | 2 |
7 files changed, 9 insertions, 11 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 01a8a3bd4492..566d99b51bef 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c | |||
@@ -4383,8 +4383,7 @@ void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path, | |||
4383 | /* | 4383 | /* |
4384 | * make the item pointed to by the path bigger, data_size is the new size. | 4384 | * make the item pointed to by the path bigger, data_size is the new size. |
4385 | */ | 4385 | */ |
4386 | void btrfs_extend_item(struct btrfs_trans_handle *trans, | 4386 | void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path, |
4387 | struct btrfs_root *root, struct btrfs_path *path, | ||
4388 | u32 data_size) | 4387 | u32 data_size) |
4389 | { | 4388 | { |
4390 | int slot; | 4389 | int slot; |
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 84d6d5cb02f6..974687808153 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -3219,8 +3219,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans, | |||
3219 | struct extent_buffer **cow_ret, u64 new_root_objectid); | 3219 | struct extent_buffer **cow_ret, u64 new_root_objectid); |
3220 | int btrfs_block_can_be_shared(struct btrfs_root *root, | 3220 | int btrfs_block_can_be_shared(struct btrfs_root *root, |
3221 | struct extent_buffer *buf); | 3221 | struct extent_buffer *buf); |
3222 | void btrfs_extend_item(struct btrfs_trans_handle *trans, | 3222 | void btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path, |
3223 | struct btrfs_root *root, struct btrfs_path *path, | ||
3224 | u32 data_size); | 3223 | u32 data_size); |
3225 | void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path, | 3224 | void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path, |
3226 | u32 new_size, int from_end); | 3225 | u32 new_size, int from_end); |
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index 47cab8dd9f15..71fa113fe41f 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c | |||
@@ -49,7 +49,7 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle | |||
49 | di = btrfs_match_dir_item_name(root, path, name, name_len); | 49 | di = btrfs_match_dir_item_name(root, path, name, name_len); |
50 | if (di) | 50 | if (di) |
51 | return ERR_PTR(-EEXIST); | 51 | return ERR_PTR(-EEXIST); |
52 | btrfs_extend_item(trans, root, path, data_size); | 52 | btrfs_extend_item(root, path, data_size); |
53 | } else if (ret < 0) | 53 | } else if (ret < 0) |
54 | return ERR_PTR(ret); | 54 | return ERR_PTR(ret); |
55 | WARN_ON(ret > 0); | 55 | WARN_ON(ret > 0); |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 40692f61e4b6..c944b6e64e7a 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -1035,7 +1035,7 @@ static int convert_extent_item_v0(struct btrfs_trans_handle *trans, | |||
1035 | return ret; | 1035 | return ret; |
1036 | BUG_ON(ret); /* Corruption */ | 1036 | BUG_ON(ret); /* Corruption */ |
1037 | 1037 | ||
1038 | btrfs_extend_item(trans, root, path, new_size); | 1038 | btrfs_extend_item(root, path, new_size); |
1039 | 1039 | ||
1040 | leaf = path->nodes[0]; | 1040 | leaf = path->nodes[0]; |
1041 | item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_extent_item); | 1041 | item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_extent_item); |
@@ -1683,7 +1683,7 @@ void setup_inline_extent_backref(struct btrfs_trans_handle *trans, | |||
1683 | type = extent_ref_type(parent, owner); | 1683 | type = extent_ref_type(parent, owner); |
1684 | size = btrfs_extent_inline_ref_size(type); | 1684 | size = btrfs_extent_inline_ref_size(type); |
1685 | 1685 | ||
1686 | btrfs_extend_item(trans, root, path, size); | 1686 | btrfs_extend_item(root, path, size); |
1687 | 1687 | ||
1688 | ei = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_extent_item); | 1688 | ei = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_extent_item); |
1689 | refs = btrfs_extent_refs(leaf, ei); | 1689 | refs = btrfs_extent_refs(leaf, ei); |
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index ea14ecb0af47..769eb86f890c 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c | |||
@@ -841,7 +841,7 @@ again: | |||
841 | diff /= csum_size; | 841 | diff /= csum_size; |
842 | diff *= csum_size; | 842 | diff *= csum_size; |
843 | 843 | ||
844 | btrfs_extend_item(trans, root, path, diff); | 844 | btrfs_extend_item(root, path, diff); |
845 | goto csum; | 845 | goto csum; |
846 | } | 846 | } |
847 | 847 | ||
diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c index cb44398885ba..1640e0344a40 100644 --- a/fs/btrfs/inode-item.c +++ b/fs/btrfs/inode-item.c | |||
@@ -361,7 +361,7 @@ static int btrfs_insert_inode_extref(struct btrfs_trans_handle *trans, | |||
361 | name, name_len, NULL)) | 361 | name, name_len, NULL)) |
362 | goto out; | 362 | goto out; |
363 | 363 | ||
364 | btrfs_extend_item(trans, root, path, ins_len); | 364 | btrfs_extend_item(root, path, ins_len); |
365 | ret = 0; | 365 | ret = 0; |
366 | } | 366 | } |
367 | if (ret < 0) | 367 | if (ret < 0) |
@@ -417,7 +417,7 @@ int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans, | |||
417 | goto out; | 417 | goto out; |
418 | 418 | ||
419 | old_size = btrfs_item_size_nr(path->nodes[0], path->slots[0]); | 419 | old_size = btrfs_item_size_nr(path->nodes[0], path->slots[0]); |
420 | btrfs_extend_item(trans, root, path, ins_len); | 420 | btrfs_extend_item(root, path, ins_len); |
421 | ref = btrfs_item_ptr(path->nodes[0], path->slots[0], | 421 | ref = btrfs_item_ptr(path->nodes[0], path->slots[0], |
422 | struct btrfs_inode_ref); | 422 | struct btrfs_inode_ref); |
423 | ref = (struct btrfs_inode_ref *)((unsigned long)ref + old_size); | 423 | ref = (struct btrfs_inode_ref *)((unsigned long)ref + old_size); |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 3442dd900e19..52287ec2a4d2 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -410,7 +410,7 @@ insert: | |||
410 | if (found_size > item_size) | 410 | if (found_size > item_size) |
411 | btrfs_truncate_item(root, path, item_size, 1); | 411 | btrfs_truncate_item(root, path, item_size, 1); |
412 | else if (found_size < item_size) | 412 | else if (found_size < item_size) |
413 | btrfs_extend_item(trans, root, path, | 413 | btrfs_extend_item(root, path, |
414 | item_size - found_size); | 414 | item_size - found_size); |
415 | } else if (ret) { | 415 | } else if (ret) { |
416 | return ret; | 416 | return ret; |