Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a6d7067 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Make btrfs_mark_extent_written take btrfs_inode 



Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a012a74e

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -3233,7 +3233,7 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans, 
		       struct btrfs_root *root, struct inode *inode, u64 start,

		       u64 end, int drop_cache);

int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,

			      struct inode *inode, u64 start, u64 end);

			      struct btrfs_inode *inode, u64 start, u64 end);

int btrfs_release_file(struct inode *inode, struct file *file);

int btrfs_dirty_pages(struct inode *inode, struct page **pages,

		      size_t num_pages, loff_t pos, size_t write_bytes,

fs/btrfs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -1082,10 +1082,10 @@ static int extent_mergeable(struct extent_buffer *leaf, int slot, 
 * two or three.

 */

int btrfs_mark_extent_written(struct btrfs_trans_handle *trans,

			      struct inode *inode, u64 start, u64 end)

			      struct btrfs_inode *inode, u64 start, u64 end)

{

	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 = btrfs_sb(inode->vfs_inode.i_sb);

	struct btrfs_root *root = inode->root;

	struct extent_buffer *leaf;

	struct btrfs_path *path;

	struct btrfs_file_extent_item *fi;
@@ -1102,7 +1102,7 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans, 
	int del_slot = 0;

	int recow;

	int ret;

	u64 ino = btrfs_ino(BTRFS_I(inode));

	u64 ino = btrfs_ino(inode);



	path = btrfs_alloc_path();

	if (!path)

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2876,7 +2876,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
		compress_type = ordered_extent->compress_type;

	if (test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) {

		BUG_ON(compress_type);

		ret = btrfs_mark_extent_written(trans, inode,

		ret = btrfs_mark_extent_written(trans, BTRFS_I(inode),

						ordered_extent->file_offset,

						ordered_extent->file_offset +

						logical_len);