Commit dd472956 authored Oct 11, 2018 by Josef Bacik Committed by Greg Kroah-Hartman Nov 13, 2018

btrfs: don't run delayed_iputs in commit



commit 30928e9baac238a7330085a1c5747f0b5df444b4 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: stable@vger.kernel.org # 4.4+
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 186b5248

fs/btrfs/transaction.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -2280,15 +2280,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)

		kmem_cache_free(btrfs_trans_handle_cachep, trans);

		/*
		* If fs has been frozen, we can not handle delayed iputs, otherwise
		* it'll result in deadlock about SB_FREEZE_FS.
		*/
		if (current != fs_info->transaction_kthread &&
		current != fs_info->cleaner_kthread &&
		!test_bit(BTRFS_FS_FROZEN, &fs_info->flags))
		btrfs_run_delayed_iputs(fs_info);

		return ret;

		scrub_continue: