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: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 0867fca4b63dababcc667609f86ff1fbc05a5e89..a120d6ba3a28264ec4810b34012b6033f8301a16 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -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;
 }

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 45e3cfd1198bc29265d28a360f3d261a70144953..f6bb6039fa4ca4061206789d1b50a3b83113fa74 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -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);

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index fb9a161f021522cb63fc543b85325e389352fe6e..4c5991c3de14961b0a94a8b105fc382d49c0434f 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -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);

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 25fc6a4f3ecff2b0ca2af8e3a7073e4c6e45bef8..2246aa2e30e33bc962f16ba0471d7a4573eafe81 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -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);