btrfs: Remove redundant inode argument from btrfs_add_ordered_sum
PATCH 1/1 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.
Signed-off-by Nikolay Borisov <[email protected]>
--- fs/btrfs/file-item.c | 4 ++-- fs/btrfs/ordered-data.c | 5 ++--- fs/btrfs/ordered-data.h | 3 +-- fs/btrfs/relocation.c | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-)
fs/btrfs/file-item.c +2 -2
@@ -464,7 +464,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;
@@ -499,7 +499,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
@@ -270,13 +270,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
@@ -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
@@ -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);
Signature · 1 line
2.17.1
Looks good,
Reviewed-by Johannes Thumshirn <[email protected]>
Signature · 6 lines
Johannes Thumshirn SUSE Labs Filesystems [email protected] +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
Quoted 5 lines · Nikolay Borisov
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.Signed-off-by Nikolay Borisov <[email protected]>
Added to misc-next, thanks.