From: Qu Wenruo Date: Wed, 11 Feb 2026 22:49:19 +0000 (+1030) Subject: btrfs: remove the btrfs_inode parameter from btrfs_remove_ordered_extent() X-Git-Tag: ceph-for-7.1-rc4~321^2~81 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afe60cdb3cb9495472b7feb10c5f2b31b7429956;p=ceph-client.git 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 Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8c2e4472332f..70b56fcaaccc 100644 --- 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 a17f18673bed..e47c3a3a619a 100644 --- 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 e178d4a489af..86e69de9e9ff 100644 --- 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);