From: David Sterba Date: Tue, 18 Feb 2025 00:34:21 +0000 (+0100) Subject: btrfs: pass struct btrfs_inode to btrfs_double_mmap_unlock() X-Git-Tag: v6.15-rc1~152^2~120 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=651cef46116f33c0897dc814b4c0ff5df43470c7;p=thirdparty%2Flinux.git btrfs: pass struct btrfs_inode to btrfs_double_mmap_unlock() Pass a struct btrfs_inode to btrfs_double_mmap_unlock() as it's an internal interface, allowing to remove some use of BTRFS_I. Reviewed-by: Johannes Thumshirn Signed-off-by: David Sterba --- diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c index 2e000e96d026b..f3aa3f4e9684d 100644 --- a/fs/btrfs/reflink.c +++ b/fs/btrfs/reflink.c @@ -625,10 +625,10 @@ static void btrfs_double_mmap_lock(struct btrfs_inode *inode1, struct btrfs_inod down_write_nested(&inode2->i_mmap_lock, SINGLE_DEPTH_NESTING); } -static void btrfs_double_mmap_unlock(struct inode *inode1, struct inode *inode2) +static void btrfs_double_mmap_unlock(struct btrfs_inode *inode1, struct btrfs_inode *inode2) { - up_write(&BTRFS_I(inode1)->i_mmap_lock); - up_write(&BTRFS_I(inode2)->i_mmap_lock); + up_write(&inode1->i_mmap_lock); + up_write(&inode2->i_mmap_lock); } static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len, @@ -892,7 +892,7 @@ out_unlock: if (same_inode) { btrfs_inode_unlock(BTRFS_I(src_inode), BTRFS_ILOCK_MMAP); } else { - btrfs_double_mmap_unlock(src_inode, dst_inode); + btrfs_double_mmap_unlock(BTRFS_I(src_inode), BTRFS_I(dst_inode)); unlock_two_nondirectories(src_inode, dst_inode); }