diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2020-06-03 08:55:30 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-07-27 12:55:34 +0200 |
| commit | c1e095202caae87ac4a5c353691a492692d61857 (patch) | |
| tree | 73568f8a924a94aade47c8a99ec93839001f59c3 | |
| parent | 98456b9c46c140275b0fe81970ddfad250c68ed4 (diff) | |
| download | linux-stable-c1e095202caae87ac4a5c353691a492692d61857.tar.gz linux-stable-c1e095202caae87ac4a5c353691a492692d61857.tar.bz2 linux-stable-c1e095202caae87ac4a5c353691a492692d61857.zip | |
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>
| -rw-r--r-- | fs/btrfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/ordered-data.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/ordered-data.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index aa48452e395f..412693947484 100644 --- 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 af1b444421fb..ebac13389e7e 100644 --- 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 c2432f0165e1..d61ea9c880a3 100644 --- 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, |