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

Commit a1ecaabb authored by Wang Shilong's avatar Wang Shilong Committed by Chris Mason
Browse files

Btrfs: fix unlock in __start_delalloc_inodes() 



This patch fix a regression caused by the following patch:
Btrfs: don't flush all delalloc inodes when we doesn't get s_umount lock

break while loop will make us call @spin_unlock() without
calling @spin_lock() before, fix it.

Signed-off-by: default avatarWang Shilong <wangsl.fnst@cn.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 3b080b25

fs/btrfs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -8500,19 +8500,20 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput, 
			else

				iput(inode);

			ret = -ENOMEM;

			break;

			goto out;

		}

		list_add_tail(&work->list, &works);

		btrfs_queue_work(root->fs_info->flush_workers,

				 &work->work);

		ret++;

		if (nr != -1 && ret >= nr)

			break;

			goto out;

		cond_resched();

		spin_lock(&root->delalloc_lock);

	}

	spin_unlock(&root->delalloc_lock);



out:

	list_for_each_entry_safe(work, next, &works, list) {

		list_del_init(&work->list);

		btrfs_wait_and_free_delalloc_work(work);