qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: Remove root argument from cow_file_range_inline 

This argument is always set to the root of the inode, which is also
passed. So let's get a reference inside the function and simplify
the arg list.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2018-03-02 09:43:15 +02:00 committed by David Sterba
parent 895a72be41
commit d02c0e2019
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/btrfs/inode.c
View File

@ -276,12 +276,12 @@ fail:
* does the checks required to make sure the data is small enough * does the checks required to make sure the data is small enough
* to fit as an inline extent. * to fit as an inline extent.
*/ */
static noinline int cow_file_range_inline(struct btrfs_root *root, static noinline int cow_file_range_inline(struct inode *inode, u64 start,
struct inode *inode, u64 start,
u64 end, size_t compressed_size, u64 end, size_t compressed_size,
int compress_type, int compress_type,
struct page **compressed_pages) struct page **compressed_pages)
{ {
struct btrfs_root *root = BTRFS_I(inode)->root;
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = root->fs_info;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
u64 isize = i_size_read(inode); u64 isize = i_size_read(inode);
@ -457,7 +457,6 @@ static noinline void compress_file_range(struct inode *inode,
int *num_added) int *num_added)
{ {
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root;
u64 blocksize = fs_info->sectorsize; u64 blocksize = fs_info->sectorsize;
u64 actual_end; u64 actual_end;
u64 isize = i_size_read(inode); u64 isize = i_size_read(inode);
@ -579,11 +578,11 @@ cont:
/* we didn't compress the entire range, try /* we didn't compress the entire range, try
* to make an uncompressed inline extent. * to make an uncompressed inline extent.
*/ */
ret = cow_file_range_inline(root, inode, start, end, ret = cow_file_range_inline(inode, start, end, 0,
0, BTRFS_COMPRESS_NONE, NULL); BTRFS_COMPRESS_NONE, NULL);
} else { } else {
/* try making a compressed inline extent */ /* try making a compressed inline extent */
ret = cow_file_range_inline(root, inode, start, end, ret = cow_file_range_inline(inode, start, end,
total_compressed, total_compressed,
compress_type, pages); compress_type, pages);
} }
@ -983,7 +982,7 @@ static noinline int cow_file_range(struct inode *inode,
if (start == 0) { if (start == 0) {
/* lets try to make an inline extent */ /* lets try to make an inline extent */
ret = cow_file_range_inline(root, inode, start, end, 0, ret = cow_file_range_inline(inode, start, end, 0,
BTRFS_COMPRESS_NONE, NULL); BTRFS_COMPRESS_NONE, NULL);
if (ret == 0) { if (ret == 0) {
/* /*