Skip to content

Commit 8631c95

Browse files
fdmananakdave
authored andcommitted
btrfs: use local variable for the transaction handle in replay_one_buffer()
Instead of keep dereferencing the walk_control structure to extract the transaction handle whenever is needed, do it once by storing it in a local variable and then use the variable everywhere. This reduces code verbosity and eliminates the need for some split lines. Reviewed-by: Boris Burkov <[email protected]> Reviewed-by: Qu Wenruo <[email protected]> Signed-off-by: Filipe Manana <[email protected]>
1 parent 314419e commit 8631c95

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

fs/btrfs/tree-log.c

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2464,6 +2464,7 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
24642464
};
24652465
struct btrfs_path *path;
24662466
struct btrfs_root *root = wc->replay_dest;
2467+
struct btrfs_trans_handle *trans = wc->trans;
24672468
struct btrfs_key key;
24682469
int i;
24692470
int ret;
@@ -2507,19 +2508,17 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
25072508
} else {
25082509
wc->ignore_cur_inode = false;
25092510
}
2510-
ret = replay_xattr_deletes(wc->trans, root, log,
2511-
path, key.objectid);
2511+
ret = replay_xattr_deletes(trans, root, log, path, key.objectid);
25122512
if (ret)
25132513
break;
25142514
mode = btrfs_inode_mode(eb, inode_item);
25152515
if (S_ISDIR(mode)) {
2516-
ret = replay_dir_deletes(wc->trans, root, log, path,
2516+
ret = replay_dir_deletes(trans, root, log, path,
25172517
key.objectid, false);
25182518
if (ret)
25192519
break;
25202520
}
2521-
ret = overwrite_item(wc->trans, root, path,
2522-
eb, i, &key);
2521+
ret = overwrite_item(trans, root, path, eb, i, &key);
25232522
if (ret)
25242523
break;
25252524

@@ -2546,21 +2545,19 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
25462545
drop_args.start = from;
25472546
drop_args.end = (u64)-1;
25482547
drop_args.drop_cache = true;
2549-
ret = btrfs_drop_extents(wc->trans, root, inode,
2550-
&drop_args);
2548+
ret = btrfs_drop_extents(trans, root, inode, &drop_args);
25512549
if (!ret) {
25522550
inode_sub_bytes(&inode->vfs_inode,
25532551
drop_args.bytes_found);
25542552
/* Update the inode's nbytes. */
2555-
ret = btrfs_update_inode(wc->trans, inode);
2553+
ret = btrfs_update_inode(trans, inode);
25562554
}
25572555
iput(&inode->vfs_inode);
25582556
if (ret)
25592557
break;
25602558
}
25612559

2562-
ret = link_to_fixup_dir(wc->trans, root,
2563-
path, key.objectid);
2560+
ret = link_to_fixup_dir(trans, root, path, key.objectid);
25642561
if (ret)
25652562
break;
25662563
}
@@ -2570,8 +2567,7 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
25702567

25712568
if (key.type == BTRFS_DIR_INDEX_KEY &&
25722569
wc->stage == LOG_WALK_REPLAY_DIR_INDEX) {
2573-
ret = replay_one_dir_item(wc->trans, root, path,
2574-
eb, i, &key);
2570+
ret = replay_one_dir_item(trans, root, path, eb, i, &key);
25752571
if (ret)
25762572
break;
25772573
}
@@ -2581,19 +2577,16 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
25812577

25822578
/* these keys are simply copied */
25832579
if (key.type == BTRFS_XATTR_ITEM_KEY) {
2584-
ret = overwrite_item(wc->trans, root, path,
2585-
eb, i, &key);
2580+
ret = overwrite_item(trans, root, path, eb, i, &key);
25862581
if (ret)
25872582
break;
25882583
} else if (key.type == BTRFS_INODE_REF_KEY ||
25892584
key.type == BTRFS_INODE_EXTREF_KEY) {
2590-
ret = add_inode_ref(wc->trans, root, log, path,
2591-
eb, i, &key);
2585+
ret = add_inode_ref(trans, root, log, path, eb, i, &key);
25922586
if (ret)
25932587
break;
25942588
} else if (key.type == BTRFS_EXTENT_DATA_KEY) {
2595-
ret = replay_one_extent(wc->trans, root, path,
2596-
eb, i, &key);
2589+
ret = replay_one_extent(trans, root, path, eb, i, &key);
25972590
if (ret)
25982591
break;
25992592
}

0 commit comments

Comments
 (0)