]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: make btrfs_add_ordered_extent_compress take btrfs_inode
authorNikolay Borisov <nborisov@suse.com>
Wed, 3 Jun 2020 05:55:15 +0000 (08:55 +0300)
committerDavid Sterba <dsterba@suse.com>
Mon, 27 Jul 2020 10:55:31 +0000 (12:55 +0200)
It simpy forwards its inode argument to __btrfs_add_ordered_extent which
already takes btrfs_inode.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/inode.c
fs/btrfs/ordered-data.c
fs/btrfs/ordered-data.h

index f1b66901dc55128edeeb1fc6a87babffbd50d06c..982fe4cca715b18ab7ba306a9f262674efe189f2 100644 (file)
@@ -862,7 +862,7 @@ retry:
                        goto out_free_reserve;
                free_extent_map(em);
 
-               ret = btrfs_add_ordered_extent_compress(inode,
+               ret = btrfs_add_ordered_extent_compress(BTRFS_I(inode),
                                                async_extent->start,
                                                ins.objectid,
                                                async_extent->ram_size,
index 156063373cc1b44710ef37ad25930501babb5e26..838fec9e245fddaa047b48d394975f5e40ca85ca 100644 (file)
@@ -270,12 +270,12 @@ int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,
                                          BTRFS_COMPRESS_NONE);
 }
 
-int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset,
+int btrfs_add_ordered_extent_compress(struct btrfs_inode *inode, u64 file_offset,
                                      u64 disk_bytenr, u64 num_bytes,
                                      u64 disk_num_bytes, int type,
                                      int compress_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, 0,
                                          compress_type);
 }
index 6c42f307b87f6893d748de097956c05da8b0ee94..03865f7211644bd046f9b59e856fa7da3ed38ec3 100644 (file)
@@ -157,7 +157,7 @@ int btrfs_add_ordered_extent(struct btrfs_inode *inode, u64 file_offset,
 int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,
                                 u64 disk_bytenr, u64 num_bytes,
                                 u64 disk_num_bytes, int type);
-int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset,
+int btrfs_add_ordered_extent_compress(struct btrfs_inode *inode, u64 file_offset,
                                      u64 disk_bytenr, u64 num_bytes,
                                      u64 disk_num_bytes, int type,
                                      int compress_type);