UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: Streamline log_extent_csums a bit 

Currently this function takes the root as an argument only to get the
log_root from it. Simplify this by directly passing the log root from
the caller. Also eliminate the fs_info local variable, since it's used
only once, so directly reference it from the transaction handle.

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-06-20 17:26:42 +03:00 committed by David Sterba
parent ca5788aba3
commit a9ecb653b0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/tree-log.c
View File

@ -4064,11 +4064,9 @@ static int extent_cmp(void *priv, struct list_head *a, struct list_head *b)
static int log_extent_csums(struct btrfs_trans_handle *trans, static int log_extent_csums(struct btrfs_trans_handle *trans,
struct btrfs_inode *inode, struct btrfs_inode *inode,
struct btrfs_root *root, struct btrfs_root *log_root,
const struct extent_map *em) const struct extent_map *em)
{ {
struct btrfs_fs_info *fs_info = root->fs_info;
struct btrfs_root *log = root->log_root;
u64 csum_offset; u64 csum_offset;
u64 csum_len; u64 csum_len;
LIST_HEAD(ordered_sums); LIST_HEAD(ordered_sums);
@ -4089,7 +4087,7 @@ static int log_extent_csums(struct btrfs_trans_handle *trans,
} }
/* block start is already adjusted for the file extent offset. */ /* block start is already adjusted for the file extent offset. */
ret = btrfs_lookup_csums_range(fs_info->csum_root, ret = btrfs_lookup_csums_range(trans->fs_info->csum_root,
em->block_start + csum_offset, em->block_start + csum_offset,
em->block_start + csum_offset + em->block_start + csum_offset +
csum_len - 1, &ordered_sums, 0); csum_len - 1, &ordered_sums, 0);
@ -4101,7 +4099,7 @@ static int log_extent_csums(struct btrfs_trans_handle *trans,
struct btrfs_ordered_sum, struct btrfs_ordered_sum,
list); list);
if (!ret) if (!ret)
ret = btrfs_csum_file_blocks(trans, log, sums); ret = btrfs_csum_file_blocks(trans, log_root, sums);
list_del(&sums->list); list_del(&sums->list);
kfree(sums); kfree(sums);
} }
@ -4125,7 +4123,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans,
int ret; int ret;
int extent_inserted = 0; int extent_inserted = 0;
ret = log_extent_csums(trans, inode, root, em); ret = log_extent_csums(trans, inode, log, em);
if (ret) if (ret)
return ret; return ret;