Skip to content

Commit 87d7ea6

Browse files
josefbacikgregkh
authored andcommitted
btrfs: don't run delayed_iputs in commit
commit 30928e9 upstream. 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]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 42551ab commit 87d7ea6

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
@@ -2307,15 +2307,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
23072307

23082308
kmem_cache_free(btrfs_trans_handle_cachep, trans);
23092309

2310-
/*
2311-
* If fs has been frozen, we can not handle delayed iputs, otherwise
2312-
* it'll result in deadlock about SB_FREEZE_FS.
2313-
*/
2314-
if (current != fs_info->transaction_kthread &&
2315-
current != fs_info->cleaner_kthread &&
2316-
!test_bit(BTRFS_FS_FROZEN, &fs_info->flags))
2317-
btrfs_run_delayed_iputs(fs_info);
2318-
23192310
return ret;
23202311

23212312
scrub_continue:

0 commit comments

Comments
 (0)