Commit 78ac4f9e authored by David Sterba's avatar David Sterba

btrfs: remove unused parameter fs_info from btrfs_truncate_item

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 25263cd7
...@@ -4541,8 +4541,7 @@ int btrfs_duplicate_item(struct btrfs_trans_handle *trans, ...@@ -4541,8 +4541,7 @@ int btrfs_duplicate_item(struct btrfs_trans_handle *trans,
* off the end of the item or if we shift the item to chop bytes off * off the end of the item or if we shift the item to chop bytes off
* the front. * the front.
*/ */
void btrfs_truncate_item(struct btrfs_fs_info *fs_info, void btrfs_truncate_item(struct btrfs_path *path, u32 new_size, int from_end)
struct btrfs_path *path, u32 new_size, int from_end)
{ {
int slot; int slot;
struct extent_buffer *leaf; struct extent_buffer *leaf;
......
...@@ -2932,8 +2932,7 @@ int btrfs_block_can_be_shared(struct btrfs_root *root, ...@@ -2932,8 +2932,7 @@ int btrfs_block_can_be_shared(struct btrfs_root *root,
struct extent_buffer *buf); struct extent_buffer *buf);
void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path, void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
u32 data_size); u32 data_size);
void btrfs_truncate_item(struct btrfs_fs_info *fs_info, void btrfs_truncate_item(struct btrfs_path *path, u32 new_size, int from_end);
struct btrfs_path *path, u32 new_size, int from_end);
int btrfs_split_item(struct btrfs_trans_handle *trans, int btrfs_split_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct btrfs_path *path, struct btrfs_path *path,
......
...@@ -429,8 +429,7 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans, ...@@ -429,8 +429,7 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
start = btrfs_item_ptr_offset(leaf, path->slots[0]); start = btrfs_item_ptr_offset(leaf, path->slots[0]);
memmove_extent_buffer(leaf, ptr, ptr + sub_item_len, memmove_extent_buffer(leaf, ptr, ptr + sub_item_len,
item_len - (ptr + sub_item_len - start)); item_len - (ptr + sub_item_len - start));
btrfs_truncate_item(root->fs_info, path, btrfs_truncate_item(path, item_len - sub_item_len, 1);
item_len - sub_item_len, 1);
} }
return ret; return ret;
} }
...@@ -1780,7 +1780,6 @@ void update_inline_extent_backref(struct btrfs_path *path, ...@@ -1780,7 +1780,6 @@ void update_inline_extent_backref(struct btrfs_path *path,
int *last_ref) int *last_ref)
{ {
struct extent_buffer *leaf = path->nodes[0]; struct extent_buffer *leaf = path->nodes[0];
struct btrfs_fs_info *fs_info = leaf->fs_info;
struct btrfs_extent_item *ei; struct btrfs_extent_item *ei;
struct btrfs_extent_data_ref *dref = NULL; struct btrfs_extent_data_ref *dref = NULL;
struct btrfs_shared_data_ref *sref = NULL; struct btrfs_shared_data_ref *sref = NULL;
...@@ -1835,7 +1834,7 @@ void update_inline_extent_backref(struct btrfs_path *path, ...@@ -1835,7 +1834,7 @@ void update_inline_extent_backref(struct btrfs_path *path,
memmove_extent_buffer(leaf, ptr, ptr + size, memmove_extent_buffer(leaf, ptr, ptr + size,
end - ptr - size); end - ptr - size);
item_size -= size; item_size -= size;
btrfs_truncate_item(fs_info, path, item_size, 1); btrfs_truncate_item(path, item_size, 1);
} }
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
} }
......
...@@ -547,7 +547,7 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info, ...@@ -547,7 +547,7 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info,
*/ */
u32 new_size = (bytenr - key->offset) >> blocksize_bits; u32 new_size = (bytenr - key->offset) >> blocksize_bits;
new_size *= csum_size; new_size *= csum_size;
btrfs_truncate_item(fs_info, path, new_size, 1); btrfs_truncate_item(path, new_size, 1);
} else if (key->offset >= bytenr && csum_end > end_byte && } else if (key->offset >= bytenr && csum_end > end_byte &&
end_byte > key->offset) { end_byte > key->offset) {
/* /*
...@@ -559,7 +559,7 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info, ...@@ -559,7 +559,7 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info,
u32 new_size = (csum_end - end_byte) >> blocksize_bits; u32 new_size = (csum_end - end_byte) >> blocksize_bits;
new_size *= csum_size; new_size *= csum_size;
btrfs_truncate_item(fs_info, path, new_size, 0); btrfs_truncate_item(path, new_size, 0);
key->offset = end_byte; key->offset = end_byte;
btrfs_set_item_key_safe(fs_info, path, key); btrfs_set_item_key_safe(fs_info, path, key);
......
...@@ -170,7 +170,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans, ...@@ -170,7 +170,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,
memmove_extent_buffer(leaf, ptr, ptr + del_len, memmove_extent_buffer(leaf, ptr, ptr + del_len,
item_size - (ptr + del_len - item_start)); item_size - (ptr + del_len - item_start));
btrfs_truncate_item(root->fs_info, path, item_size - del_len, 1); btrfs_truncate_item(path, item_size - del_len, 1);
out: out:
btrfs_free_path(path); btrfs_free_path(path);
...@@ -234,7 +234,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans, ...@@ -234,7 +234,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans,
item_start = btrfs_item_ptr_offset(leaf, path->slots[0]); item_start = btrfs_item_ptr_offset(leaf, path->slots[0]);
memmove_extent_buffer(leaf, ptr, ptr + sub_item_len, memmove_extent_buffer(leaf, ptr, ptr + sub_item_len,
item_size - (ptr + sub_item_len - item_start)); item_size - (ptr + sub_item_len - item_start));
btrfs_truncate_item(root->fs_info, path, item_size - sub_item_len, 1); btrfs_truncate_item(path, item_size - sub_item_len, 1);
out: out:
btrfs_free_path(path); btrfs_free_path(path);
......
...@@ -4669,7 +4669,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, ...@@ -4669,7 +4669,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
btrfs_set_file_extent_ram_bytes(leaf, fi, size); btrfs_set_file_extent_ram_bytes(leaf, fi, size);
size = btrfs_file_extent_calc_inline_size(size); size = btrfs_file_extent_calc_inline_size(size);
btrfs_truncate_item(root->fs_info, path, size, 1); btrfs_truncate_item(path, size, 1);
} else if (!del_item) { } else if (!del_item) {
/* /*
* We have to bail so the last_size is set to * We have to bail so the last_size is set to
......
...@@ -465,7 +465,7 @@ static noinline int overwrite_item(struct btrfs_trans_handle *trans, ...@@ -465,7 +465,7 @@ static noinline int overwrite_item(struct btrfs_trans_handle *trans,
found_size = btrfs_item_size_nr(path->nodes[0], found_size = btrfs_item_size_nr(path->nodes[0],
path->slots[0]); path->slots[0]);
if (found_size > item_size) if (found_size > item_size)
btrfs_truncate_item(fs_info, path, item_size, 1); btrfs_truncate_item(path, item_size, 1);
else if (found_size < item_size) else if (found_size < item_size)
btrfs_extend_item(fs_info, path, btrfs_extend_item(fs_info, path,
item_size - found_size); item_size - found_size);
......
...@@ -219,7 +219,7 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type, ...@@ -219,7 +219,7 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,
move_src = offset + sizeof(subid); move_src = offset + sizeof(subid);
move_len = item_size - (move_src - btrfs_item_ptr_offset(eb, slot)); move_len = item_size - (move_src - btrfs_item_ptr_offset(eb, slot));
memmove_extent_buffer(eb, move_dst, move_src, move_len); memmove_extent_buffer(eb, move_dst, move_src, move_len);
btrfs_truncate_item(fs_info, path, item_size - sizeof(subid), 1); btrfs_truncate_item(path, item_size - sizeof(subid), 1);
out: out:
btrfs_free_path(path); btrfs_free_path(path);
......
...@@ -188,8 +188,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode, ...@@ -188,8 +188,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
btrfs_extend_item(fs_info, path, btrfs_extend_item(fs_info, path,
size - old_data_len); size - old_data_len);
else if (size < old_data_len) else if (size < old_data_len)
btrfs_truncate_item(fs_info, path, btrfs_truncate_item(path, data_size, 1);
data_size, 1);
} else { } else {
/* There are other xattrs packed in the same item. */ /* There are other xattrs packed in the same item. */
ret = btrfs_delete_one_dir_name(trans, root, path, di); ret = btrfs_delete_one_dir_name(trans, root, path, di);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment