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

btrfs: Remove redundant inode argument from btrfs_add_ordered_sum 



Ordered csums are keyed off of a btrfs_ordered_extent, which already has
a reference to the inode. This implies that an explicit inode argument
is redundant. So remove it.

Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
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 8d47a0d8

fs/btrfs/file-item.c

+2 −2
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio, 


				sums->len = this_sum_bytes;

				this_sum_bytes = 0;

				btrfs_add_ordered_sum(inode, ordered, sums);

				btrfs_add_ordered_sum(ordered, sums);

				btrfs_put_ordered_extent(ordered);



				bytes_left = bio->bi_iter.bi_size - total_bytes;
@@ -506,7 +506,7 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio, 


	}

	this_sum_bytes = 0;

	btrfs_add_ordered_sum(inode, ordered, sums);

	btrfs_add_ordered_sum(ordered, sums);

	btrfs_put_ordered_extent(ordered);

	return 0;

}

fs/btrfs/ordered-data.c

+2 −3
Original line number Diff line number Diff line
@@ -271,13 +271,12 @@ int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset, 
 * when an ordered extent is finished.  If the list covers more than one

 * ordered extent, it is split across multiples.

 */

void btrfs_add_ordered_sum(struct inode *inode,

			   struct btrfs_ordered_extent *entry,

void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,

			   struct btrfs_ordered_sum *sum)

{

	struct btrfs_ordered_inode_tree *tree;



	tree = &BTRFS_I(inode)->ordered_tree;

	tree = &BTRFS_I(entry->inode)->ordered_tree;

	spin_lock_irq(&tree->lock);

	list_add_tail(&sum->list, &entry->list);

	spin_unlock_irq(&tree->lock);

fs/btrfs/ordered-data.h

+1 −2
Original line number Diff line number Diff line
@@ -167,8 +167,7 @@ int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset, 
int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset,

				      u64 start, u64 len, u64 disk_len,

				      int type, int compress_type);

void btrfs_add_ordered_sum(struct inode *inode,

			   struct btrfs_ordered_extent *entry,

void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry,

			   struct btrfs_ordered_sum *sum);

struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode,

							 u64 file_offset);

fs/btrfs/relocation.c

+1 −1
Original line number Diff line number Diff line
@@ -4604,7 +4604,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len) 
		new_bytenr = ordered->start + (sums->bytenr - disk_bytenr);

		sums->bytenr = new_bytenr;



		btrfs_add_ordered_sum(inode, ordered, sums);

		btrfs_add_ordered_sum(ordered, sums);

	}

out:

	btrfs_put_ordered_extent(ordered);

CRA Git | Maintained and supported by SUSTech CRA and CCSE