diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-06-01 03:57:49 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-06-01 03:57:49 -0400 |
| commit | 1d61e73ab4c7470833241af888939a7aab2b0354 (patch) | |
| tree | dd714c2428070a7ea2bf807c2821ac75ff13ec55 /fs/btrfs/async-thread.c | |
| parent | 84fe6c19e4a598e8071e3bd1b2c923454eae1268 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35
Diffstat (limited to 'fs/btrfs/async-thread.c')
| -rw-r--r-- | fs/btrfs/async-thread.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c index 462859a30141..7ec14097fef1 100644 --- a/fs/btrfs/async-thread.c +++ b/fs/btrfs/async-thread.c | |||
| @@ -377,6 +377,7 @@ again: | |||
| 377 | if (!list_empty(&worker->pending) || | 377 | if (!list_empty(&worker->pending) || |
| 378 | !list_empty(&worker->prio_pending)) { | 378 | !list_empty(&worker->prio_pending)) { |
| 379 | spin_unlock_irq(&worker->lock); | 379 | spin_unlock_irq(&worker->lock); |
| 380 | set_current_state(TASK_RUNNING); | ||
| 380 | goto again; | 381 | goto again; |
| 381 | } | 382 | } |
| 382 | 383 | ||