diff mbox series

[10/14] btrfs: Make btrfs_insert_replace_extent take btrfs_inode

Message ID 20201102144906.3767963-11-nborisov@suse.com (mailing list archive)
State New, archived
Headers show
Series Another batch of inode vs btrfs_inode cleanups | expand

Commit Message

Nikolay Borisov Nov. 2, 2020, 2:49 p.m. UTC 
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
 fs/btrfs/file.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

--
2.25.1
diff mbox series

Patch

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 1baf69f012fe..0f3b9fb842e7 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2550,13 +2550,13 @@  static int btrfs_punch_hole_lock_range(struct inode *inode,
 }

 static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans,
-				     struct inode *inode,
-				     struct btrfs_path *path,
-				     struct btrfs_replace_extent_info *extent_info,
-				     const u64 replace_len)
+				       struct btrfs_inode *inode,
+				       struct btrfs_path *path,
+				       struct btrfs_replace_extent_info *extent_info,
+				       const u64 replace_len)
 {
-	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
-	struct btrfs_root *root = BTRFS_I(inode)->root;
+	struct btrfs_fs_info *fs_info = trans->fs_info;
+	struct btrfs_root *root = inode->root;
 	struct btrfs_file_extent_item *extent;
 	struct extent_buffer *leaf;
 	struct btrfs_key key;
@@ -2571,7 +2571,7 @@  static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans,
 	    btrfs_fs_incompat(fs_info, NO_HOLES))
 		return 0;

-	key.objectid = btrfs_ino(BTRFS_I(inode));
+	key.objectid = btrfs_ino(inode);
 	key.type = BTRFS_EXTENT_DATA_KEY;
 	key.offset = extent_info->file_offset;
 	ret = btrfs_insert_empty_item(trans, root, path, &key,
@@ -2592,8 +2592,8 @@  static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans,
 	btrfs_mark_buffer_dirty(leaf);
 	btrfs_release_path(path);

-	ret = btrfs_inode_set_file_extent_range(BTRFS_I(inode),
-			extent_info->file_offset, replace_len);
+	ret = btrfs_inode_set_file_extent_range(inode, extent_info->file_offset,
+						replace_len);
 	if (ret)
 		return ret;

@@ -2601,14 +2601,14 @@  static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans,
 	if (extent_info->disk_offset == 0)
 		return 0;

-	inode_add_bytes(inode, replace_len);
+	inode_add_bytes(&inode->vfs_inode, replace_len);

 	if (extent_info->is_new_extent && extent_info->insertions == 0) {
 		key.objectid = extent_info->disk_offset;
 		key.type = BTRFS_EXTENT_ITEM_KEY;
 		key.offset = extent_info->disk_len;
 		ret = btrfs_alloc_reserved_file_extent(trans, root,
-						       btrfs_ino(BTRFS_I(inode)),
+						       btrfs_ino(inode),
 						       extent_info->file_offset,
 						       extent_info->qgroup_reserved,
 						       &key);
@@ -2620,7 +2620,7 @@  static int btrfs_insert_replace_extent(struct btrfs_trans_handle *trans,
 				       extent_info->disk_len, 0);
 		ref_offset = extent_info->file_offset - extent_info->data_offset;
 		btrfs_init_data_ref(&ref, root->root_key.objectid,
-				    btrfs_ino(BTRFS_I(inode)), ref_offset);
+				    btrfs_ino(inode), ref_offset);
 		ret = btrfs_inc_extent_ref(trans, &ref);
 	}

@@ -2747,8 +2747,9 @@  int btrfs_replace_file_extents(struct inode *inode, struct btrfs_path *path,
 		if (extent_info && drop_end > extent_info->file_offset) {
 			u64 replace_len = drop_end - extent_info->file_offset;

-			ret = btrfs_insert_replace_extent(trans, inode, path,
-							extent_info, replace_len);
+			ret = btrfs_insert_replace_extent(trans, BTRFS_I(inode),
+							  path,	extent_info,
+							  replace_len);
 			if (ret) {
 				btrfs_abort_transaction(trans, ret);
 				break;
@@ -2844,8 +2845,9 @@  int btrfs_replace_file_extents(struct inode *inode, struct btrfs_path *path,

 	}
 	if (extent_info) {
-		ret = btrfs_insert_replace_extent(trans, inode, path, extent_info,
-						extent_info->data_len);
+		ret = btrfs_insert_replace_extent(trans, BTRFS_I(inode), path,
+						  extent_info,
+						  extent_info->data_len);
 		if (ret) {
 			btrfs_abort_transaction(trans, ret);
 			goto out_trans;