btrfs: remove unused parameter fs_info from btrfs_truncate_item

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 928d4d8..d8252ba 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -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
  * the front.
  */
-void btrfs_truncate_item(struct btrfs_fs_info *fs_info,
-                        struct btrfs_path *path, u32 new_size, int from_end)
+void btrfs_truncate_item(struct btrfs_path *path, u32 new_size, int from_end)
 {
        int slot;
        struct extent_buffer *leaf;

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index aa557b4..b6b570b 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2932,8 +2932,7 @@ int btrfs_block_can_be_shared(struct btrfs_root *root,
                              struct extent_buffer *buf);
 void btrfs_extend_item(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
                       u32 data_size);
-void btrfs_truncate_item(struct btrfs_fs_info *fs_info,
-                        struct btrfs_path *path, u32 new_size, int from_end);
+void btrfs_truncate_item(struct btrfs_path *path, u32 new_size, int from_end);
 int btrfs_split_item(struct btrfs_trans_handle *trans,
                     struct btrfs_root *root,
                     struct btrfs_path *path,

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 8de74d8..2120b61 100644 (file)
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -429,8 +429,7 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
                start = btrfs_item_ptr_offset(leaf, path->slots[0]);
                memmove_extent_buffer(leaf, ptr, ptr + sub_item_len,
                        item_len - (ptr + sub_item_len - start));
-               btrfs_truncate_item(root->fs_info, path,
-                                   item_len - sub_item_len, 1);
+               btrfs_truncate_item(path, item_len - sub_item_len, 1);
        }
        return ret;
 }

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 34078f3..01dbc8b 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1780,7 +1780,6 @@ void update_inline_extent_backref(struct btrfs_path *path,
                                  int *last_ref)
 {
        struct extent_buffer *leaf = path->nodes[0];
-       struct btrfs_fs_info *fs_info = leaf->fs_info;
        struct btrfs_extent_item *ei;
        struct btrfs_extent_data_ref *dref = NULL;
        struct btrfs_shared_data_ref *sref = NULL;
@@ -1835,7 +1834,7 @@ void update_inline_extent_backref(struct btrfs_path *path,
                        memmove_extent_buffer(leaf, ptr, ptr + size,
                                              end - ptr - 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);
 }

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index a120d6b..9f6ceb8 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -547,7 +547,7 @@ static noinline void truncate_one_csum(struct btrfs_fs_info *fs_info,
                 */
                u32 new_size = (bytenr - key->offset) >> blocksize_bits;
                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 &&
                   end_byte > key->offset) {
                /*
@@ -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;
                new_size *= csum_size;
 
-               btrfs_truncate_item(fs_info, path, new_size, 0);
+               btrfs_truncate_item(path, new_size, 0);
 
                key->offset = end_byte;
                btrfs_set_item_key_safe(fs_info, path, key);

diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c
index a8956a3..3e0f12d 100644 (file)
--- a/fs/btrfs/inode-item.c
+++ b/fs/btrfs/inode-item.c
@@ -170,7 +170,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,
        memmove_extent_buffer(leaf, ptr, ptr + del_len,
                              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:
        btrfs_free_path(path);
@@ -234,7 +234,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans,
        item_start = btrfs_item_ptr_offset(leaf, path->slots[0]);
        memmove_extent_buffer(leaf, ptr, ptr + sub_item_len,
                              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:
        btrfs_free_path(path);
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 19eebda..fb237ff 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4669,7 +4669,7 @@ search_again:
 
                                btrfs_set_file_extent_ram_bytes(leaf, fi, 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) {
                                /*
                                 * We have to bail so the last_size is set to

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index b94a0cc..13aabbf 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -465,7 +465,7 @@ insert:
                found_size = btrfs_item_size_nr(path->nodes[0],
                                                path->slots[0]);
                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)
                        btrfs_extend_item(fs_info, path,
                                          item_size - found_size);

diff --git a/fs/btrfs/uuid-tree.c b/fs/btrfs/uuid-tree.c
index c1cc9a5..44838ad 100644 (file)
--- a/fs/btrfs/uuid-tree.c
+++ b/fs/btrfs/uuid-tree.c
@@ -219,7 +219,7 @@ int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,
        move_src = offset + sizeof(subid);
        move_len = item_size - (move_src - btrfs_item_ptr_offset(eb, slot));
        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:
        btrfs_free_path(path);

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 10da873..c5593d0 100644 (file)
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -188,8 +188,7 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
                                btrfs_extend_item(fs_info, path,
                                                  size - old_data_len);
                        else if (size < old_data_len)
-                               btrfs_truncate_item(fs_info, path,
-                                                   data_size, 1);
+                               btrfs_truncate_item(path, data_size, 1);
                } else {
                        /* There are other xattrs packed in the same item. */
                        ret = btrfs_delete_one_dir_name(trans, root, path, di);