Commit 9a56fcd1 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make btrfs_update_inode take btrfs_inode 



Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent dfeb9e7c

fs/btrfs/block-group.c

+1 −1
Original line number Diff line number Diff line
@@ -2405,7 +2405,7 @@ static int cache_save_setup(struct btrfs_block_group *block_group, 
	 * time.

	 */

	BTRFS_I(inode)->generation = 0;

	ret = btrfs_update_inode(trans, root, inode);

	ret = btrfs_update_inode(trans, root, BTRFS_I(inode));

	if (ret) {

		/*

		 * So theoretically we could recover from this, simply set the

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -3112,8 +3112,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, 
				    struct page *page, size_t pg_offset,

				    u64 start, u64 end);

int btrfs_update_inode(struct btrfs_trans_handle *trans,

			      struct btrfs_root *root,

			      struct inode *inode);

		       struct btrfs_root *root, struct btrfs_inode *inode);

int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,

				struct btrfs_root *root, struct inode *inode);

int btrfs_orphan_add(struct btrfs_trans_handle *trans,

fs/btrfs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -2741,7 +2741,7 @@ int btrfs_replace_file_extents(struct inode *inode, struct btrfs_path *path, 


		cur_offset = drop_args.drop_end;



		ret = btrfs_update_inode(trans, root, inode);

		ret = btrfs_update_inode(trans, root, BTRFS_I(inode));

		if (ret)

			break;
@@ -2978,7 +2978,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) 
	ASSERT(trans != NULL);

	inode_inc_iversion(inode);

	inode->i_mtime = inode->i_ctime = current_time(inode);

	ret = btrfs_update_inode(trans, root, inode);

	ret = btrfs_update_inode(trans, root, BTRFS_I(inode));

	updated_inode = true;

	btrfs_end_transaction(trans);

	btrfs_btree_balance_dirty(fs_info);
@@ -3005,7 +3005,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) 
		} else {

			int ret2;



			ret = btrfs_update_inode(trans, root, inode);

			ret = btrfs_update_inode(trans, root, BTRFS_I(inode));

			ret2 = btrfs_end_transaction(trans);

			if (!ret)

				ret = ret2;
@@ -3074,7 +3074,7 @@ static int btrfs_fallocate_update_isize(struct inode *inode, 
	inode->i_ctime = current_time(inode);

	i_size_write(inode, end);

	btrfs_inode_safe_disk_i_size_write(BTRFS_I(inode), 0);

	ret = btrfs_update_inode(trans, root, inode);

	ret = btrfs_update_inode(trans, root, BTRFS_I(inode));

	ret2 = btrfs_end_transaction(trans);



	return ret ? ret : ret2;

fs/btrfs/free-space-cache.c

+3 −3
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans, 
	if (ret)

		goto fail;



	ret = btrfs_update_inode(trans, root, inode);

	ret = btrfs_update_inode(trans, root, BTRFS_I(inode));



fail:

	if (locked)
@@ -1193,7 +1193,7 @@ static int __btrfs_wait_cache_io(struct btrfs_root *root, 
	  "failed to write free space cache for block group %llu error %d",

				  block_group->start, ret);

	}

	btrfs_update_inode(trans, root, inode);

	btrfs_update_inode(trans, root, BTRFS_I(inode));



	if (block_group) {

		/* the dirty list is protected by the dirty_bgs_lock */
@@ -1383,7 +1383,7 @@ static int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode, 
		invalidate_inode_pages2(inode->i_mapping);

		BTRFS_I(inode)->generation = 0;

	}

	btrfs_update_inode(trans, root, inode);

	btrfs_update_inode(trans, root, BTRFS_I(inode));

	if (must_iput)

		iput(inode);

	return ret;

fs/btrfs/inode-map.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ int btrfs_save_ino_cache(struct btrfs_root *root, 
	}



	BTRFS_I(inode)->generation = 0;

	ret = btrfs_update_inode(trans, root, inode);

	ret = btrfs_update_inode(trans, root, BTRFS_I(inode));

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto out_put;