btrfs: remove the btrfs_inode parameter from btrfs_remove_ordered_extent()

We already have btrfs_ordered_extent::inode, thus there is no need to
pass a btrfs_inode parameter to btrfs_remove_ordered_extent().

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8c2e4472332f5fe5d592c1ca6d3fafa62919272b..70b56fcaaccca6f8badb2c074334c9be3e29d28c 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3430,7 +3430,7 @@ out:
         * This needs to be done to make sure anybody waiting knows we are done
         * updating everything for this ordered extent.
         */
-       btrfs_remove_ordered_extent(inode, ordered_extent);
+       btrfs_remove_ordered_extent(ordered_extent);
 
        /* once for us */
        btrfs_put_ordered_extent(ordered_extent);
@@ -8176,7 +8176,7 @@ void btrfs_destroy_inode(struct inode *vfs_inode)
                        if (!freespace_inode)
                                btrfs_lockdep_acquire(root->fs_info, btrfs_ordered_extent);
 
-                       btrfs_remove_ordered_extent(inode, ordered);
+                       btrfs_remove_ordered_extent(ordered);
                        btrfs_put_ordered_extent(ordered);
                        btrfs_put_ordered_extent(ordered);
                }

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index a17f18673bed455419dc7f0a3ba281ce441cd877..e47c3a3a619abbbc3bef4a99d4e3ca9527d3665c 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -638,9 +638,9 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry)
  * remove an ordered extent from the tree.  No references are dropped
  * and waiters are woken up.
  */
-void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,
-                                struct btrfs_ordered_extent *entry)
+void btrfs_remove_ordered_extent(struct btrfs_ordered_extent *entry)
 {
+       struct btrfs_inode *btrfs_inode = entry->inode;
        struct btrfs_root *root = btrfs_inode->root;
        struct btrfs_fs_info *fs_info = root->fs_info;
        struct rb_node *node;

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index e178d4a489af77bc352cbc68e7ce39dd9108fbef..86e69de9e9ff50ad770348255ddde75e5dbbc58b 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -161,8 +161,7 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent);
 int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent);
 
 void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry);
-void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,
-                               struct btrfs_ordered_extent *entry);
+void btrfs_remove_ordered_extent(struct btrfs_ordered_extent *entry);
 void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
                                 struct folio *folio, u64 file_offset, u64 len,
                                 bool uptodate);