@@ -2464,6 +2464,7 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
2464
2464
};
2465
2465
struct btrfs_path * path ;
2466
2466
struct btrfs_root * root = wc -> replay_dest ;
2467
+ struct btrfs_trans_handle * trans = wc -> trans ;
2467
2468
struct btrfs_key key ;
2468
2469
int i ;
2469
2470
int ret ;
@@ -2507,19 +2508,17 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
2507
2508
} else {
2508
2509
wc -> ignore_cur_inode = false;
2509
2510
}
2510
- ret = replay_xattr_deletes (wc -> trans , root , log ,
2511
- path , key .objectid );
2511
+ ret = replay_xattr_deletes (trans , root , log , path , key .objectid );
2512
2512
if (ret )
2513
2513
break ;
2514
2514
mode = btrfs_inode_mode (eb , inode_item );
2515
2515
if (S_ISDIR (mode )) {
2516
- ret = replay_dir_deletes (wc -> trans , root , log , path ,
2516
+ ret = replay_dir_deletes (trans , root , log , path ,
2517
2517
key .objectid , false);
2518
2518
if (ret )
2519
2519
break ;
2520
2520
}
2521
- ret = overwrite_item (wc -> trans , root , path ,
2522
- eb , i , & key );
2521
+ ret = overwrite_item (trans , root , path , eb , i , & key );
2523
2522
if (ret )
2524
2523
break ;
2525
2524
@@ -2546,21 +2545,19 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
2546
2545
drop_args .start = from ;
2547
2546
drop_args .end = (u64 )- 1 ;
2548
2547
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 );
2551
2549
if (!ret ) {
2552
2550
inode_sub_bytes (& inode -> vfs_inode ,
2553
2551
drop_args .bytes_found );
2554
2552
/* Update the inode's nbytes. */
2555
- ret = btrfs_update_inode (wc -> trans , inode );
2553
+ ret = btrfs_update_inode (trans , inode );
2556
2554
}
2557
2555
iput (& inode -> vfs_inode );
2558
2556
if (ret )
2559
2557
break ;
2560
2558
}
2561
2559
2562
- ret = link_to_fixup_dir (wc -> trans , root ,
2563
- path , key .objectid );
2560
+ ret = link_to_fixup_dir (trans , root , path , key .objectid );
2564
2561
if (ret )
2565
2562
break ;
2566
2563
}
@@ -2570,8 +2567,7 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
2570
2567
2571
2568
if (key .type == BTRFS_DIR_INDEX_KEY &&
2572
2569
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 );
2575
2571
if (ret )
2576
2572
break ;
2577
2573
}
@@ -2581,19 +2577,16 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
2581
2577
2582
2578
/* these keys are simply copied */
2583
2579
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 );
2586
2581
if (ret )
2587
2582
break ;
2588
2583
} else if (key .type == BTRFS_INODE_REF_KEY ||
2589
2584
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 );
2592
2586
if (ret )
2593
2587
break ;
2594
2588
} 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 );
2597
2590
if (ret )
2598
2591
break ;
2599
2592
}
0 commit comments