Skip to content

Commit 30928e9

Browse files
josefbacikkdave
authored andcommitted
btrfs: don't run delayed_iputs in commit
This could result in a really bad case where we do something like evict evict_refill_and_join btrfs_commit_transaction btrfs_run_delayed_iputs evict evict_refill_and_join btrfs_commit_transaction ... forever We have plenty of other places where we run delayed iputs that are much safer, let those do the work. CC: [email protected] # 4.4+ Reviewed-by: Filipe Manana <[email protected]> Signed-off-by: Josef Bacik <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 80ee54b commit 30928e9

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

fs/btrfs/transaction.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2283,15 +2283,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
22832283

22842284
kmem_cache_free(btrfs_trans_handle_cachep, trans);
22852285

2286-
/*
2287-
* If fs has been frozen, we can not handle delayed iputs, otherwise
2288-
* it'll result in deadlock about SB_FREEZE_FS.
2289-
*/
2290-
if (current != fs_info->transaction_kthread &&
2291-
current != fs_info->cleaner_kthread &&
2292-
!test_bit(BTRFS_FS_FROZEN, &fs_info->flags))
2293-
btrfs_run_delayed_iputs(fs_info);
2294-
22952286
return ret;
22962287

22972288
scrub_continue:

0 commit comments

Comments
 (0)