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

Commit ed3b3d31 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: don't walk around with task->state != TASK_RUNNING 



Yan Zheng noticed two places we were doing a lot of work
without task->state set to TASK_RUNNING.  This sets the state
properly after we get ready to sleep but decide not to.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 11c65dcc

fs/btrfs/async-thread.c

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ static int worker_loop(void *arg) 
				if (!list_empty(&worker->pending) ||

				    !list_empty(&worker->prio_pending)) {

					spin_unlock_irq(&worker->lock);

					set_current_state(TASK_RUNNING);

					goto again;

				}

fs/btrfs/transaction.c

+3 −3
Original line number Diff line number Diff line
@@ -1063,9 +1063,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
			snap_pending = 1;



		WARN_ON(cur_trans != trans->transaction);

		prepare_to_wait(&cur_trans->writer_wait, &wait,

				TASK_UNINTERRUPTIBLE);



		if (cur_trans->num_writers > 1)

			timeout = MAX_SCHEDULE_TIMEOUT;

		else if (should_grow)
@@ -1088,6 +1085,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, 
		 */

		btrfs_run_ordered_operations(root, 1);



		prepare_to_wait(&cur_trans->writer_wait, &wait,

				TASK_UNINTERRUPTIBLE);



		smp_mb();

		if (cur_trans->num_writers > 1 || should_grow)

			schedule_timeout(timeout);