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

Commit 66657b31 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: barrier before waitqueue_active 



We need a barrir before calling waitqueue_active otherwise we will miss
wakeups.  So in places that do atomic_dec(); then atomic_read() use
atomic_dec_return() which imply a memory barrier (see memory-barriers.txt)
and then add an explicit memory barrier everywhere else that need them.
Thanks,

Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 1fa11e26

fs/btrfs/compression.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -818,6 +818,7 @@ static void free_workspace(int type, struct list_head *workspace) 
	btrfs_compress_op[idx]->free_workspace(workspace);

	btrfs_compress_op[idx]->free_workspace(workspace);

	atomic_dec(alloc_workspace);

	atomic_dec(alloc_workspace);

wake:

wake:

	smp_mb();

	if (waitqueue_active(workspace_wait))

	if (waitqueue_active(workspace_wait))

		wake_up(workspace_wait);

		wake_up(workspace_wait);

}

}

fs/btrfs/delayed-inode.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -512,8 +512,8 @@ static void __btrfs_remove_delayed_item(struct btrfs_delayed_item *delayed_item) 




	rb_erase(&delayed_item->rb_node, root);

	rb_erase(&delayed_item->rb_node, root);

	delayed_item->delayed_node->count--;

	delayed_item->delayed_node->count--;

	atomic_dec(&delayed_root->items);

	if (atomic_dec_return(&delayed_root->items) <

	if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND &&

	    BTRFS_DELAYED_BACKGROUND &&

	    waitqueue_active(&delayed_root->wait))

	    waitqueue_active(&delayed_root->wait))

		wake_up(&delayed_root->wait);

		wake_up(&delayed_root->wait);

}

}
@@ -1056,8 +1056,7 @@ static void btrfs_release_delayed_inode(struct btrfs_delayed_node *delayed_node) 
		delayed_node->count--;

		delayed_node->count--;





		delayed_root = delayed_node->root->fs_info->delayed_root;

		delayed_root = delayed_node->root->fs_info->delayed_root;

		atomic_dec(&delayed_root->items);

		if (atomic_dec_return(&delayed_root->items) <

		if (atomic_read(&delayed_root->items) <

		    BTRFS_DELAYED_BACKGROUND &&

		    BTRFS_DELAYED_BACKGROUND &&

		    waitqueue_active(&delayed_root->wait))

		    waitqueue_active(&delayed_root->wait))

			wake_up(&delayed_root->wait);

			wake_up(&delayed_root->wait);

fs/btrfs/disk-io.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -754,9 +754,7 @@ static void run_one_async_done(struct btrfs_work *work) 
	limit = btrfs_async_submit_limit(fs_info);

	limit = btrfs_async_submit_limit(fs_info);

	limit = limit * 2 / 3;

	limit = limit * 2 / 3;





	atomic_dec(&fs_info->nr_async_submits);

	if (atomic_dec_return(&fs_info->nr_async_submits) < limit &&



	if (atomic_read(&fs_info->nr_async_submits) < limit &&

	    waitqueue_active(&fs_info->async_submit_wait))

	    waitqueue_active(&fs_info->async_submit_wait))

		wake_up(&fs_info->async_submit_wait);

		wake_up(&fs_info->async_submit_wait);
@@ -3783,14 +3781,17 @@ int btrfs_cleanup_transaction(struct btrfs_root *root) 
		/* FIXME: cleanup wait for commit */

		/* FIXME: cleanup wait for commit */

		t->in_commit = 1;

		t->in_commit = 1;

		t->blocked = 1;

		t->blocked = 1;

		smp_mb();

		if (waitqueue_active(&root->fs_info->transaction_blocked_wait))

		if (waitqueue_active(&root->fs_info->transaction_blocked_wait))

			wake_up(&root->fs_info->transaction_blocked_wait);

			wake_up(&root->fs_info->transaction_blocked_wait);





		t->blocked = 0;

		t->blocked = 0;

		smp_mb();

		if (waitqueue_active(&root->fs_info->transaction_wait))

		if (waitqueue_active(&root->fs_info->transaction_wait))

			wake_up(&root->fs_info->transaction_wait);

			wake_up(&root->fs_info->transaction_wait);





		t->commit_done = 1;

		t->commit_done = 1;

		smp_mb();

		if (waitqueue_active(&t->commit_wait))

		if (waitqueue_active(&t->commit_wait))

			wake_up(&t->commit_wait);

			wake_up(&t->commit_wait);

fs/btrfs/inode.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1007,9 +1007,7 @@ static noinline void async_cow_submit(struct btrfs_work *work) 
	nr_pages = (async_cow->end - async_cow->start + PAGE_CACHE_SIZE) >>

	nr_pages = (async_cow->end - async_cow->start + PAGE_CACHE_SIZE) >>

		PAGE_CACHE_SHIFT;

		PAGE_CACHE_SHIFT;





	atomic_sub(nr_pages, &root->fs_info->async_delalloc_pages);

	if (atomic_sub_return(nr_pages, &root->fs_info->async_delalloc_pages) <



	if (atomic_read(&root->fs_info->async_delalloc_pages) <

	    5 * 1024 * 1024 &&

	    5 * 1024 * 1024 &&

	    waitqueue_active(&root->fs_info->async_submit_wait))

	    waitqueue_active(&root->fs_info->async_submit_wait))

		wake_up(&root->fs_info->async_submit_wait);

		wake_up(&root->fs_info->async_submit_wait);

fs/btrfs/volumes.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -227,9 +227,8 @@ static noinline void run_scheduled_bios(struct btrfs_device *device) 
		cur = pending;

		cur = pending;

		pending = pending->bi_next;

		pending = pending->bi_next;

		cur->bi_next = NULL;

		cur->bi_next = NULL;

		atomic_dec(&fs_info->nr_async_bios);





		if (atomic_read(&fs_info->nr_async_bios) < limit &&

		if (atomic_dec_return(&fs_info->nr_async_bios) < limit &&

		    waitqueue_active(&fs_info->async_submit_wait))

		    waitqueue_active(&fs_info->async_submit_wait))

			wake_up(&fs_info->async_submit_wait);

			wake_up(&fs_info->async_submit_wait);