btrfs: make btrfs_add_ordered_extent_dio take btrfs_inode

Simply forwards its argument so let's get rid of one extra BTRFS_I by
taking btrfs_inode directly.

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/inode.c b/fs/btrfs/inode.c
index aa48452e395f9eb4e0bc692b546f47194b5ae679..412693947484c40fb32803170e5ed8dba0a944e4 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6890,7 +6890,7 @@ static struct extent_map *btrfs_create_dio_extent(struct inode *inode,
                if (IS_ERR(em))
                        goto out;
        }
-       ret = btrfs_add_ordered_extent_dio(inode, start, block_start,
+       ret = btrfs_add_ordered_extent_dio(BTRFS_I(inode), start, block_start,
                                           len, block_len, type);
        if (ret) {
                if (em) {

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index af1b444421fbaebf1e190c98c09f6851bd0a2a36..ebac13389e7e6bffe6c79e0ba3b19be298f78297 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -260,11 +260,11 @@ int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset,
                                          BTRFS_COMPRESS_NONE);
 }
 
-int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,
+int btrfs_add_ordered_extent_dio(struct btrfs_inode *inode, u64 file_offset,
                                 u64 disk_bytenr, u64 num_bytes,
                                 u64 disk_num_bytes, int type)
 {
-       return __btrfs_add_ordered_extent(BTRFS_I(inode), file_offset, disk_bytenr,
+       return __btrfs_add_ordered_extent(inode, file_offset, disk_bytenr,
                                          num_bytes, disk_num_bytes, type, 1,
                                          BTRFS_COMPRESS_NONE);
 }

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index c2432f0165e1ac6f25a3b7ef44097ab80bd45b93..d61ea9c880a32719ed7e80a4b9a4aef011d07838 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -154,7 +154,7 @@ int btrfs_dec_test_first_ordered_pending(struct btrfs_inode *inode,
 int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset,
                             u64 disk_bytenr, u64 num_bytes, u64 disk_num_bytes,
                             int type);
-int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,
+int btrfs_add_ordered_extent_dio(struct btrfs_inode *inode, u64 file_offset,
                                 u64 disk_bytenr, u64 num_bytes,
                                 u64 disk_num_bytes, int type);
 int btrfs_add_ordered_extent_compress(struct btrfs_inode *inode, u64 file_offset,