Skip to content

Commit 43d623d

Browse files
fdmananasmb49
fdmanana
authored and
smb49
committed
btrfs: use NOFS context when getting inodes during logging and log replay
BugLink: https://bugs.launchpad.net/bugs/2076435 [ Upstream commit d182575 ] During inode logging (and log replay too), we are holding a transaction handle and we often need to call btrfs_iget(), which will read an inode from its subvolume btree if it's not loaded in memory and that results in allocating an inode with GFP_KERNEL semantics at the btrfs_alloc_inode() callback - and this may recurse into the filesystem in case we are under memory pressure and attempt to commit the current transaction, resulting in a deadlock since the logging (or log replay) task is holding a transaction handle open. Syzbot reported this with the following stack traces: WARNING: possible circular locking dependency detected 6.10.0-rc2-syzkaller-00361-g061d1af7b030 #0 Not tainted ------------------------------------------------------ syz-executor.1/9919 is trying to acquire lock: ffffffff8dd3aac0 (fs_reclaim){+.+.}-{0:0}, at: might_alloc include/linux/sched/mm.h:334 [inline] ffffffff8dd3aac0 (fs_reclaim){+.+.}-{0:0}, at: slab_pre_alloc_hook mm/slub.c:3891 [inline] ffffffff8dd3aac0 (fs_reclaim){+.+.}-{0:0}, at: slab_alloc_node mm/slub.c:3981 [inline] ffffffff8dd3aac0 (fs_reclaim){+.+.}-{0:0}, at: kmem_cache_alloc_lru_noprof+0x58/0x2f0 mm/slub.c:4020 but task is already holding lock: ffff88804b569358 (&ei->log_mutex){+.+.}-{3:3}, at: btrfs_log_inode+0x39c/0x4660 fs/btrfs/tree-log.c:6481 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #3 (&ei->log_mutex){+.+.}-{3:3}: __mutex_lock_common kernel/locking/mutex.c:608 [inline] __mutex_lock+0x175/0x9c0 kernel/locking/mutex.c:752 btrfs_log_inode+0x39c/0x4660 fs/btrfs/tree-log.c:6481 btrfs_log_inode_parent+0x8cb/0x2a90 fs/btrfs/tree-log.c:7079 btrfs_log_dentry_safe+0x59/0x80 fs/btrfs/tree-log.c:7180 btrfs_sync_file+0x9c1/0xe10 fs/btrfs/file.c:1959 vfs_fsync_range+0x141/0x230 fs/sync.c:188 generic_write_sync include/linux/fs.h:2794 [inline] btrfs_do_write_iter+0x584/0x10c0 fs/btrfs/file.c:1705 new_sync_write fs/read_write.c:497 [inline] vfs_write+0x6b6/0x1140 fs/read_write.c:590 ksys_write+0x12f/0x260 fs/read_write.c:643 do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline] __do_fast_syscall_32+0x73/0x120 arch/x86/entry/common.c:386 do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411 entry_SYSENTER_compat_after_hwframe+0x84/0x8e -> #2 (btrfs_trans_num_extwriters){++++}-{0:0}: join_transaction+0x164/0xf40 fs/btrfs/transaction.c:315 start_transaction+0x427/0x1a70 fs/btrfs/transaction.c:700 btrfs_commit_super+0xa1/0x110 fs/btrfs/disk-io.c:4170 close_ctree+0xcb0/0xf90 fs/btrfs/disk-io.c:4324 generic_shutdown_super+0x159/0x3d0 fs/super.c:642 kill_anon_super+0x3a/0x60 fs/super.c:1226 btrfs_kill_super+0x3b/0x50 fs/btrfs/super.c:2096 deactivate_locked_super+0xbe/0x1a0 fs/super.c:473 deactivate_super+0xde/0x100 fs/super.c:506 cleanup_mnt+0x222/0x450 fs/namespace.c:1267 task_work_run+0x14e/0x250 kernel/task_work.c:180 resume_user_mode_work include/linux/resume_user_mode.h:50 [inline] exit_to_user_mode_loop kernel/entry/common.c:114 [inline] exit_to_user_mode_prepare include/linux/entry-common.h:328 [inline] __syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline] syscall_exit_to_user_mode+0x278/0x2a0 kernel/entry/common.c:218 __do_fast_syscall_32+0x80/0x120 arch/x86/entry/common.c:389 do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411 entry_SYSENTER_compat_after_hwframe+0x84/0x8e -> #1 (btrfs_trans_num_writers){++++}-{0:0}: __lock_release kernel/locking/lockdep.c:5468 [inline] lock_release+0x33e/0x6c0 kernel/locking/lockdep.c:5774 percpu_up_read include/linux/percpu-rwsem.h:99 [inline] __sb_end_write include/linux/fs.h:1650 [inline] sb_end_intwrite include/linux/fs.h:1767 [inline] __btrfs_end_transaction+0x5ca/0x920 fs/btrfs/transaction.c:1071 btrfs_commit_inode_delayed_inode+0x228/0x330 fs/btrfs/delayed-inode.c:1301 btrfs_evict_inode+0x960/0xe80 fs/btrfs/inode.c:5291 evict+0x2ed/0x6c0 fs/inode.c:667 iput_final fs/inode.c:1741 [inline] iput.part.0+0x5a8/0x7f0 fs/inode.c:1767 iput+0x5c/0x80 fs/inode.c:1757 dentry_unlink_inode+0x295/0x480 fs/dcache.c:400 __dentry_kill+0x1d0/0x600 fs/dcache.c:603 dput.part.0+0x4b1/0x9b0 fs/dcache.c:845 dput+0x1f/0x30 fs/dcache.c:835 ovl_stack_put+0x60/0x90 fs/overlayfs/util.c:132 ovl_destroy_inode+0xc6/0x190 fs/overlayfs/super.c:182 destroy_inode+0xc4/0x1b0 fs/inode.c:311 iput_final fs/inode.c:1741 [inline] iput.part.0+0x5a8/0x7f0 fs/inode.c:1767 iput+0x5c/0x80 fs/inode.c:1757 dentry_unlink_inode+0x295/0x480 fs/dcache.c:400 __dentry_kill+0x1d0/0x600 fs/dcache.c:603 shrink_kill fs/dcache.c:1048 [inline] shrink_dentry_list+0x140/0x5d0 fs/dcache.c:1075 prune_dcache_sb+0xeb/0x150 fs/dcache.c:1156 super_cache_scan+0x32a/0x550 fs/super.c:221 do_shrink_slab+0x44f/0x11c0 mm/shrinker.c:435 shrink_slab_memcg mm/shrinker.c:548 [inline] shrink_slab+0xa87/0x1310 mm/shrinker.c:626 shrink_one+0x493/0x7c0 mm/vmscan.c:4790 shrink_many mm/vmscan.c:4851 [inline] lru_gen_shrink_node+0x89f/0x1750 mm/vmscan.c:4951 shrink_node mm/vmscan.c:5910 [inline] kswapd_shrink_node mm/vmscan.c:6720 [inline] balance_pgdat+0x1105/0x1970 mm/vmscan.c:6911 kswapd+0x5ea/0xbf0 mm/vmscan.c:7180 kthread+0x2c1/0x3a0 kernel/kthread.c:389 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 -> #0 (fs_reclaim){+.+.}-{0:0}: check_prev_add kernel/locking/lockdep.c:3134 [inline] check_prevs_add kernel/locking/lockdep.c:3253 [inline] validate_chain kernel/locking/lockdep.c:3869 [inline] __lock_acquire+0x2478/0x3b30 kernel/locking/lockdep.c:5137 lock_acquire kernel/locking/lockdep.c:5754 [inline] lock_acquire+0x1b1/0x560 kernel/locking/lockdep.c:5719 __fs_reclaim_acquire mm/page_alloc.c:3801 [inline] fs_reclaim_acquire+0x102/0x160 mm/page_alloc.c:3815 might_alloc include/linux/sched/mm.h:334 [inline] slab_pre_alloc_hook mm/slub.c:3891 [inline] slab_alloc_node mm/slub.c:3981 [inline] kmem_cache_alloc_lru_noprof+0x58/0x2f0 mm/slub.c:4020 btrfs_alloc_inode+0x118/0xb20 fs/btrfs/inode.c:8411 alloc_inode+0x5d/0x230 fs/inode.c:261 iget5_locked fs/inode.c:1235 [inline] iget5_locked+0x1c9/0x2c0 fs/inode.c:1228 btrfs_iget_locked fs/btrfs/inode.c:5590 [inline] btrfs_iget_path fs/btrfs/inode.c:5607 [inline] btrfs_iget+0xfb/0x230 fs/btrfs/inode.c:5636 add_conflicting_inode fs/btrfs/tree-log.c:5657 [inline] copy_inode_items_to_log+0x1039/0x1e30 fs/btrfs/tree-log.c:5928 btrfs_log_inode+0xa48/0x4660 fs/btrfs/tree-log.c:6592 log_new_delayed_dentries fs/btrfs/tree-log.c:6363 [inline] btrfs_log_inode+0x27dd/0x4660 fs/btrfs/tree-log.c:6718 btrfs_log_all_parents fs/btrfs/tree-log.c:6833 [inline] btrfs_log_inode_parent+0x22ba/0x2a90 fs/btrfs/tree-log.c:7141 btrfs_log_dentry_safe+0x59/0x80 fs/btrfs/tree-log.c:7180 btrfs_sync_file+0x9c1/0xe10 fs/btrfs/file.c:1959 vfs_fsync_range+0x141/0x230 fs/sync.c:188 generic_write_sync include/linux/fs.h:2794 [inline] btrfs_do_write_iter+0x584/0x10c0 fs/btrfs/file.c:1705 do_iter_readv_writev+0x504/0x780 fs/read_write.c:741 vfs_writev+0x36f/0xde0 fs/read_write.c:971 do_pwritev+0x1b2/0x260 fs/read_write.c:1072 __do_compat_sys_pwritev2 fs/read_write.c:1218 [inline] __se_compat_sys_pwritev2 fs/read_write.c:1210 [inline] __ia32_compat_sys_pwritev2+0x121/0x1b0 fs/read_write.c:1210 do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline] __do_fast_syscall_32+0x73/0x120 arch/x86/entry/common.c:386 do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411 entry_SYSENTER_compat_after_hwframe+0x84/0x8e other info that might help us debug this: Chain exists of: fs_reclaim --> btrfs_trans_num_extwriters --> &ei->log_mutex Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&ei->log_mutex); lock(btrfs_trans_num_extwriters); lock(&ei->log_mutex); lock(fs_reclaim); *** DEADLOCK *** 7 locks held by syz-executor.1/9919: #0: ffff88802be20420 (sb_writers#23){.+.+}-{0:0}, at: do_pwritev+0x1b2/0x260 fs/read_write.c:1072 #1: ffff888065c0f8f0 (&sb->s_type->i_mutex_key#33){++++}-{3:3}, at: inode_lock include/linux/fs.h:791 [inline] #1: ffff888065c0f8f0 (&sb->s_type->i_mutex_key#33){++++}-{3:3}, at: btrfs_inode_lock+0xc8/0x110 fs/btrfs/inode.c:385 #2: ffff888065c0f778 (&ei->i_mmap_lock){++++}-{3:3}, at: btrfs_inode_lock+0xee/0x110 fs/btrfs/inode.c:388 #3: ffff88802be20610 (sb_internal#4){.+.+}-{0:0}, at: btrfs_sync_file+0x95b/0xe10 fs/btrfs/file.c:1952 #4: ffff8880546323f0 (btrfs_trans_num_writers){++++}-{0:0}, at: join_transaction+0x430/0xf40 fs/btrfs/transaction.c:290 #5: ffff888054632418 (btrfs_trans_num_extwriters){++++}-{0:0}, at: join_transaction+0x430/0xf40 fs/btrfs/transaction.c:290 #6: ffff88804b569358 (&ei->log_mutex){+.+.}-{3:3}, at: btrfs_log_inode+0x39c/0x4660 fs/btrfs/tree-log.c:6481 stack backtrace: CPU: 2 PID: 9919 Comm: syz-executor.1 Not tainted 6.10.0-rc2-syzkaller-00361-g061d1af7b030 #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:114 check_noncircular+0x31a/0x400 kernel/locking/lockdep.c:2187 check_prev_add kernel/locking/lockdep.c:3134 [inline] check_prevs_add kernel/locking/lockdep.c:3253 [inline] validate_chain kernel/locking/lockdep.c:3869 [inline] __lock_acquire+0x2478/0x3b30 kernel/locking/lockdep.c:5137 lock_acquire kernel/locking/lockdep.c:5754 [inline] lock_acquire+0x1b1/0x560 kernel/locking/lockdep.c:5719 __fs_reclaim_acquire mm/page_alloc.c:3801 [inline] fs_reclaim_acquire+0x102/0x160 mm/page_alloc.c:3815 might_alloc include/linux/sched/mm.h:334 [inline] slab_pre_alloc_hook mm/slub.c:3891 [inline] slab_alloc_node mm/slub.c:3981 [inline] kmem_cache_alloc_lru_noprof+0x58/0x2f0 mm/slub.c:4020 btrfs_alloc_inode+0x118/0xb20 fs/btrfs/inode.c:8411 alloc_inode+0x5d/0x230 fs/inode.c:261 iget5_locked fs/inode.c:1235 [inline] iget5_locked+0x1c9/0x2c0 fs/inode.c:1228 btrfs_iget_locked fs/btrfs/inode.c:5590 [inline] btrfs_iget_path fs/btrfs/inode.c:5607 [inline] btrfs_iget+0xfb/0x230 fs/btrfs/inode.c:5636 add_conflicting_inode fs/btrfs/tree-log.c:5657 [inline] copy_inode_items_to_log+0x1039/0x1e30 fs/btrfs/tree-log.c:5928 btrfs_log_inode+0xa48/0x4660 fs/btrfs/tree-log.c:6592 log_new_delayed_dentries fs/btrfs/tree-log.c:6363 [inline] btrfs_log_inode+0x27dd/0x4660 fs/btrfs/tree-log.c:6718 btrfs_log_all_parents fs/btrfs/tree-log.c:6833 [inline] btrfs_log_inode_parent+0x22ba/0x2a90 fs/btrfs/tree-log.c:7141 btrfs_log_dentry_safe+0x59/0x80 fs/btrfs/tree-log.c:7180 btrfs_sync_file+0x9c1/0xe10 fs/btrfs/file.c:1959 vfs_fsync_range+0x141/0x230 fs/sync.c:188 generic_write_sync include/linux/fs.h:2794 [inline] btrfs_do_write_iter+0x584/0x10c0 fs/btrfs/file.c:1705 do_iter_readv_writev+0x504/0x780 fs/read_write.c:741 vfs_writev+0x36f/0xde0 fs/read_write.c:971 do_pwritev+0x1b2/0x260 fs/read_write.c:1072 __do_compat_sys_pwritev2 fs/read_write.c:1218 [inline] __se_compat_sys_pwritev2 fs/read_write.c:1210 [inline] __ia32_compat_sys_pwritev2+0x121/0x1b0 fs/read_write.c:1210 do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline] __do_fast_syscall_32+0x73/0x120 arch/x86/entry/common.c:386 do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411 entry_SYSENTER_compat_after_hwframe+0x84/0x8e RIP: 0023:0xf7334579 Code: b8 01 10 06 03 (...) RSP: 002b:00000000f5f265ac EFLAGS: 00000292 ORIG_RAX: 000000000000017b RAX: ffffffffffffffda RBX: 0000000000000004 RCX: 00000000200002c0 RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000000 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000292 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 Fix this by ensuring we are under a NOFS scope whenever we call btrfs_iget() during inode logging and log replay. Reported-by: syzbot+8576cfa84070dce4d59b@syzkaller.appspotmail.com Link: https://lore.kernel.org/linux-btrfs/000000000000274a3a061abbd928@google.com/ Fixes: 712e36c ("btrfs: use GFP_KERNEL in btrfs_alloc_inode") Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Portia Stephens <portia.stephens@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent 6396c5d commit 43d623d

File tree

1 file changed

+28
-15
lines changed

1 file changed

+28
-15
lines changed

‎fs/btrfs/tree-log.c‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,25 @@ static void wait_log_commit(struct btrfs_root *root, int transid);
140140
* and once to do all the other items.
141141
*/
142142

143+
static struct inode *btrfs_iget_logging(u64 objectid, struct btrfs_root *root)
144+
{
145+
unsigned int nofs_flag;
146+
struct inode *inode;
147+
148+
/*
149+
* We're holding a transaction handle whether we are logging or
150+
* replaying a log tree, so we must make sure NOFS semantics apply
151+
* because btrfs_alloc_inode() may be triggered and it uses GFP_KERNEL
152+
* to allocate an inode, which can recurse back into the filesystem and
153+
* attempt a transaction commit, resulting in a deadlock.
154+
*/
155+
nofs_flag = memalloc_nofs_save();
156+
inode = btrfs_iget(root->fs_info->sb, objectid, root);
157+
memalloc_nofs_restore(nofs_flag);
158+
159+
return inode;
160+
}
161+
143162
/*
144163
* start a sub transaction and setup the log tree
145164
* this increments the log tree writer count to make the people
@@ -602,7 +621,7 @@ static noinline struct inode *read_one_inode(struct btrfs_root *root,
602621
{
603622
struct inode *inode;
604623

605-
inode = btrfs_iget(root->fs_info->sb, objectid, root);
624+
inode = btrfs_iget_logging(objectid, root);
606625
if (IS_ERR(inode))
607626
inode = NULL;
608627
return inode;
@@ -5371,7 +5390,6 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
53715390
struct btrfs_log_ctx *ctx)
53725391
{
53735392
struct btrfs_root *root = start_inode->root;
5374-
struct btrfs_fs_info *fs_info = root->fs_info;
53755393
struct btrfs_path *path;
53765394
LIST_HEAD(dir_list);
53775395
struct btrfs_dir_list *dir_elem;
@@ -5432,7 +5450,7 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
54325450
continue;
54335451

54345452
btrfs_release_path(path);
5435-
di_inode = btrfs_iget(fs_info->sb, di_key.objectid, root);
5453+
di_inode = btrfs_iget_logging(di_key.objectid, root);
54365454
if (IS_ERR(di_inode)) {
54375455
ret = PTR_ERR(di_inode);
54385456
goto out;
@@ -5492,7 +5510,7 @@ static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
54925510
btrfs_add_delayed_iput(curr_inode);
54935511
curr_inode = NULL;
54945512

5495-
vfs_inode = btrfs_iget(fs_info->sb, ino, root);
5513+
vfs_inode = btrfs_iget_logging(ino, root);
54965514
if (IS_ERR(vfs_inode)) {
54975515
ret = PTR_ERR(vfs_inode);
54985516
break;
@@ -5587,7 +5605,7 @@ static int add_conflicting_inode(struct btrfs_trans_handle *trans,
55875605
if (ctx->num_conflict_inodes >= MAX_CONFLICT_INODES)
55885606
return BTRFS_LOG_FORCE_COMMIT;
55895607

5590-
inode = btrfs_iget(root->fs_info->sb, ino, root);
5608+
inode = btrfs_iget_logging(ino, root);
55915609
/*
55925610
* If the other inode that had a conflicting dir entry was deleted in
55935611
* the current transaction then we either:
@@ -5688,7 +5706,6 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,
56885706
struct btrfs_root *root,
56895707
struct btrfs_log_ctx *ctx)
56905708
{
5691-
struct btrfs_fs_info *fs_info = root->fs_info;
56925709
int ret = 0;
56935710

56945711
/*
@@ -5719,7 +5736,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,
57195736
list_del(&curr->list);
57205737
kfree(curr);
57215738

5722-
inode = btrfs_iget(fs_info->sb, ino, root);
5739+
inode = btrfs_iget_logging(ino, root);
57235740
/*
57245741
* If the other inode that had a conflicting dir entry was
57255742
* deleted in the current transaction, we need to log its parent
@@ -5730,7 +5747,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,
57305747
if (ret != -ENOENT)
57315748
break;
57325749

5733-
inode = btrfs_iget(fs_info->sb, parent, root);
5750+
inode = btrfs_iget_logging(parent, root);
57345751
if (IS_ERR(inode)) {
57355752
ret = PTR_ERR(inode);
57365753
break;
@@ -6252,7 +6269,6 @@ static int log_new_delayed_dentries(struct btrfs_trans_handle *trans,
62526269
struct btrfs_log_ctx *ctx)
62536270
{
62546271
const bool orig_log_new_dentries = ctx->log_new_dentries;
6255-
struct btrfs_fs_info *fs_info = trans->fs_info;
62566272
struct btrfs_delayed_item *item;
62576273
int ret = 0;
62586274

@@ -6278,7 +6294,7 @@ static int log_new_delayed_dentries(struct btrfs_trans_handle *trans,
62786294
if (key.type == BTRFS_ROOT_ITEM_KEY)
62796295
continue;
62806296

6281-
di_inode = btrfs_iget(fs_info->sb, key.objectid, inode->root);
6297+
di_inode = btrfs_iget_logging(key.objectid, inode->root);
62826298
if (IS_ERR(di_inode)) {
62836299
ret = PTR_ERR(di_inode);
62846300
break;
@@ -6662,7 +6678,6 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
66626678
struct btrfs_inode *inode,
66636679
struct btrfs_log_ctx *ctx)
66646680
{
6665-
struct btrfs_fs_info *fs_info = trans->fs_info;
66666681
int ret;
66676682
struct btrfs_path *path;
66686683
struct btrfs_key key;
@@ -6727,8 +6742,7 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
67276742
cur_offset = item_size;
67286743
}
67296744

6730-
dir_inode = btrfs_iget(fs_info->sb, inode_key.objectid,
6731-
root);
6745+
dir_inode = btrfs_iget_logging(inode_key.objectid, root);
67326746
/*
67336747
* If the parent inode was deleted, return an error to
67346748
* fallback to a transaction commit. This is to prevent
@@ -6790,7 +6804,6 @@ static int log_new_ancestors(struct btrfs_trans_handle *trans,
67906804
btrfs_item_key_to_cpu(path->nodes[0], &found_key, path->slots[0]);
67916805

67926806
while (true) {
6793-
struct btrfs_fs_info *fs_info = root->fs_info;
67946807
struct extent_buffer *leaf;
67956808
int slot;
67966809
struct btrfs_key search_key;
@@ -6805,7 +6818,7 @@ static int log_new_ancestors(struct btrfs_trans_handle *trans,
68056818
search_key.objectid = found_key.offset;
68066819
search_key.type = BTRFS_INODE_ITEM_KEY;
68076820
search_key.offset = 0;
6808-
inode = btrfs_iget(fs_info->sb, ino, root);
6821+
inode = btrfs_iget_logging(ino, root);
68096822
if (IS_ERR(inode))
68106823
return PTR_ERR(inode);
68116824

0 commit comments

Comments
 (0)