Commit 487e81d2 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: pass the ino via truncate control 



In the future we are going to want to truncate inode items without
needing to have an btrfs_inode to pass in, so add ino to the
btrfs_truncate_control and use that to look up the inode items to
truncate.

Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 655807b8

fs/btrfs/free-space-cache.c

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans, 
{

	struct btrfs_truncate_control control = {

		.new_size = 0,

		.ino = btrfs_ino(BTRFS_I(vfs_inode)),

		.min_type = BTRFS_EXTENT_DATA_KEY,

		.clear_extent_range = true,

	};

fs/btrfs/inode-item.c

+3 −4
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
	int pending_del_slot = 0;

	int extent_type = -1;

	int ret;

	u64 ino = btrfs_ino(inode);

	u64 bytes_deleted = 0;

	bool be_nice = false;

	bool should_throttle = false;
@@ -480,7 +479,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
		return -ENOMEM;

	path->reada = READA_BACK;



	key.objectid = ino;

	key.objectid = control->ino;

	key.offset = (u64)-1;

	key.type = (u8)-1;
@@ -516,7 +515,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
		btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);

		found_type = found_key.type;



		if (found_key.objectid != ino)

		if (found_key.objectid != control->ino)

			break;



		if (found_type < control->min_type)
@@ -667,7 +666,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
			btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF,

					extent_start, extent_num_bytes, 0);

			btrfs_init_data_ref(&ref, btrfs_header_owner(leaf),

					ino, extent_offset,

					control->ino, extent_offset,

					root->root_key.objectid, false);

			ret = btrfs_free_extent(trans, &ref);

			if (ret) {

fs/btrfs/inode-item.h

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ struct btrfs_truncate_control { 
	/* OUT: the number of bytes to sub from this inode. */

	u64 sub_bytes;



	/* IN: the ino we are truncating. */

	u64 ino;



	/*

	 * IN: minimum key type to remove.  All key types with this type are

	 * removed only if their offset >= new_size.

fs/btrfs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -5252,6 +5252,7 @@ void btrfs_evict_inode(struct inode *inode) 


	while (1) {

		struct btrfs_truncate_control control = {

			.ino = btrfs_ino(BTRFS_I(inode)),

			.new_size = 0,

			.min_type = 0,

		};
@@ -8533,6 +8534,7 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf) 
static int btrfs_truncate(struct inode *inode, bool skip_writeback)

{

	struct btrfs_truncate_control control = {

		.ino = btrfs_ino(BTRFS_I(inode)),

		.min_type = BTRFS_EXTENT_DATA_KEY,

		.clear_extent_range = true,

	};

fs/btrfs/tree-log.c

+1 −0
Original line number Diff line number Diff line
@@ -4100,6 +4100,7 @@ static int truncate_inode_items(struct btrfs_trans_handle *trans, 
{

	struct btrfs_truncate_control control = {

		.new_size = new_size,

		.ino = btrfs_ino(inode),

		.min_type = min_type,

		.skip_ref_updates = true,

	};