Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f76506 authored by Josef Bacik's avatar Josef Bacik
Browse files

Btrfs: stop trying to shrink delalloc if there are no inodes to reclaim 



In very severe ENOSPC cases we can run out of inodes to do delalloc on, which
means we'll just keep looping trying to shrink delalloc.  Instead, if we fail to
shrink delalloc 3 times in a row break out since we're not likely to make any
progress.  Tested this with a 100mb fs an xfstests test 13.  Before the patch it
would hang the box, with the patch we get -ENOSPC like we should.  Thanks,

Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
parent 9fe6206f

fs/btrfs/extent-tree.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -3115,6 +3115,7 @@ static int shrink_delalloc(struct btrfs_trans_handle *trans, 
	u64 reserved;

	u64 reserved;

	u64 max_reclaim;

	u64 max_reclaim;

	u64 reclaimed = 0;

	u64 reclaimed = 0;

	int no_reclaim = 0;

	int pause = 1;

	int pause = 1;

	int ret;

	int ret;
@@ -3131,12 +3132,16 @@ static int shrink_delalloc(struct btrfs_trans_handle *trans, 
	while (1) {

	while (1) {

		ret = btrfs_start_one_delalloc_inode(root, trans ? 1 : 0);

		ret = btrfs_start_one_delalloc_inode(root, trans ? 1 : 0);

		if (!ret) {

		if (!ret) {

			if (no_reclaim > 2)

				break;

			no_reclaim++;

			__set_current_state(TASK_INTERRUPTIBLE);

			__set_current_state(TASK_INTERRUPTIBLE);

			schedule_timeout(pause);

			schedule_timeout(pause);

			pause <<= 1;

			pause <<= 1;

			if (pause > HZ / 10)

			if (pause > HZ / 10)

				pause = HZ / 10;

				pause = HZ / 10;

		} else {

		} else {

			no_reclaim = 0;

			pause = 1;

			pause = 1;

		}

		}