GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 17:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2010-05-25 10:12:41 -04:00
parent 11c65dccf7
commit ed3b3d314c
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
fs/btrfs/async-thread.c
View file

@ -377,6 +377,7 @@ again:
if (!list_empty(&worker->pending) || if (!list_empty(&worker->pending) ||
!list_empty(&worker->prio_pending)) { !list_empty(&worker->prio_pending)) {
spin_unlock_irq(&worker->lock); spin_unlock_irq(&worker->lock);
set_current_state(TASK_RUNNING);
goto again; goto again;
} }

6
fs/btrfs/transaction.c
View file

@ -1063,9 +1063,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
snap_pending = 1; snap_pending = 1;
WARN_ON(cur_trans != trans->transaction); WARN_ON(cur_trans != trans->transaction);
prepare_to_wait(&cur_trans->writer_wait, &wait,
TASK_UNINTERRUPTIBLE);
if (cur_trans->num_writers > 1) if (cur_trans->num_writers > 1)
timeout = MAX_SCHEDULE_TIMEOUT; timeout = MAX_SCHEDULE_TIMEOUT;
else if (should_grow) else if (should_grow)
@ -1088,6 +1085,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
*/ */
btrfs_run_ordered_operations(root, 1); btrfs_run_ordered_operations(root, 1);
prepare_to_wait(&cur_trans->writer_wait, &wait,
TASK_UNINTERRUPTIBLE);
smp_mb(); smp_mb();
if (cur_trans->num_writers > 1 || should_grow) if (cur_trans->num_writers > 1 || should_grow)
schedule_timeout(timeout); schedule_timeout(timeout);