btrfs: rename btrfs_insert_file_extent() to btrfs_insert_hole_extent()

btrfs_insert_file_extent() is only ever used to insert holes, so rename
it and remove the redundant parameters.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Omar Sandoval <osandov@osandov.com>
Signed-off-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 804962f97452dd8a40fb8c54f35909e7eb3984fd..f2d556accf346b23561ff50ba842c083a6ece9d2 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3343,12 +3343,9 @@ int btrfs_find_orphan_item(struct btrfs_root *root, u64 offset);
 int btrfs_del_csums(struct btrfs_trans_handle *trans,
                    struct btrfs_root *root, u64 bytenr, u64 len);
 blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u8 *dst);
-int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
-                            struct btrfs_root *root,
-                            u64 objectid, u64 pos,
-                            u64 disk_offset, u64 disk_num_bytes,
-                            u64 num_bytes, u64 offset, u64 ram_bytes,
-                            u8 compression, u8 encryption, u16 other_encoding);
+int btrfs_insert_hole_extent(struct btrfs_trans_handle *trans,
+                            struct btrfs_root *root, u64 objectid, u64 pos,
+                            u64 num_bytes);
 int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root,
                             struct btrfs_path *path, u64 objectid,

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index c828f971a3462b8debc07f62bda5c05e4cb27561..29999686d234c62476011e9a35fc92c8801af3ce 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -129,12 +129,9 @@ static inline u32 max_ordered_sum_bytes(struct btrfs_fs_info *fs_info,
        return ncsums * fs_info->sectorsize;
 }
 
-int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
+int btrfs_insert_hole_extent(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root,
-                            u64 objectid, u64 pos,
-                            u64 disk_offset, u64 disk_num_bytes,
-                            u64 num_bytes, u64 offset, u64 ram_bytes,
-                            u8 compression, u8 encryption, u16 other_encoding)
+                            u64 objectid, u64 pos, u64 num_bytes)
 {
        int ret = 0;
        struct btrfs_file_extent_item *item;
@@ -157,16 +154,16 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
        leaf = path->nodes[0];
        item = btrfs_item_ptr(leaf, path->slots[0],
                              struct btrfs_file_extent_item);
-       btrfs_set_file_extent_disk_bytenr(leaf, item, disk_offset);
-       btrfs_set_file_extent_disk_num_bytes(leaf, item, disk_num_bytes);
-       btrfs_set_file_extent_offset(leaf, item, offset);
+       btrfs_set_file_extent_disk_bytenr(leaf, item, 0);
+       btrfs_set_file_extent_disk_num_bytes(leaf, item, 0);
+       btrfs_set_file_extent_offset(leaf, item, 0);
        btrfs_set_file_extent_num_bytes(leaf, item, num_bytes);
-       btrfs_set_file_extent_ram_bytes(leaf, item, ram_bytes);
+       btrfs_set_file_extent_ram_bytes(leaf, item, num_bytes);
        btrfs_set_file_extent_generation(leaf, item, trans->transid);
        btrfs_set_file_extent_type(leaf, item, BTRFS_FILE_EXTENT_REG);
-       btrfs_set_file_extent_compression(leaf, item, compression);
-       btrfs_set_file_extent_encryption(leaf, item, encryption);
-       btrfs_set_file_extent_other_encoding(leaf, item, other_encoding);
+       btrfs_set_file_extent_compression(leaf, item, 0);
+       btrfs_set_file_extent_encryption(leaf, item, 0);
+       btrfs_set_file_extent_other_encoding(leaf, item, 0);
 
        btrfs_mark_buffer_dirty(leaf);
 out:

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 8dfce1c40b5f92c8836e040eef6cbcd7053ded2a..c2bc0e364c3a86a2d674d58f86ebe4331abb48db 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2505,8 +2505,8 @@ static int fill_holes(struct btrfs_trans_handle *trans,
        }
        btrfs_release_path(path);
 
-       ret = btrfs_insert_file_extent(trans, root, btrfs_ino(inode),
-                       offset, 0, 0, end - offset, 0, end - offset, 0, 0, 0);
+       ret = btrfs_insert_hole_extent(trans, root, btrfs_ino(inode), offset,
+                                      end - offset);
        if (ret)
                return ret;
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b069557270558b39bda1071ed3fe56c2e0b06e21..b04ce7a299ad42934fc64164625dbd5c64e21566 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5023,8 +5023,7 @@ static int maybe_insert_hole(struct btrfs_root *root, struct btrfs_inode *inode,
                return ret;
        }
 
-       ret = btrfs_insert_file_extent(trans, root, btrfs_ino(inode),
-                       offset, 0, 0, len, 0, len, 0, 0, 0);
+       ret = btrfs_insert_hole_extent(trans, root, btrfs_ino(inode), offset, len);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
        } else {

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 9205c4a5ca81dd4ea4854ba2b1a29d149121a0e3..c40d6001d24cf164d28b6ae3d1d8e256cf7c2c55 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -5221,10 +5221,9 @@ static int btrfs_log_holes(struct btrfs_trans_handle *trans,
                         * leafs from the log root.
                         */
                        btrfs_release_path(path);
-                       ret = btrfs_insert_file_extent(trans, root->log_root,
-                                                      ino, prev_extent_end, 0,
-                                                      0, hole_len, 0, hole_len,
-                                                      0, 0, 0);
+                       ret = btrfs_insert_hole_extent(trans, root->log_root,
+                                                      ino, prev_extent_end,
+                                                      hole_len);
                        if (ret < 0)
                                return ret;
 
@@ -5253,10 +5252,8 @@ static int btrfs_log_holes(struct btrfs_trans_handle *trans,
 
                btrfs_release_path(path);
                hole_len = ALIGN(i_size - prev_extent_end, fs_info->sectorsize);
-               ret = btrfs_insert_file_extent(trans, root->log_root,
-                                              ino, prev_extent_end, 0, 0,
-                                              hole_len, 0, hole_len,
-                                              0, 0, 0);
+               ret = btrfs_insert_hole_extent(trans, root->log_root, ino,
+                                              prev_extent_end, hole_len);
                if (ret < 0)
                        return ret;
        }