diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-07 15:02:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-07 15:02:20 -0700 |
| commit | cba82925c249e9d001ce98fef17d9c6360d86e70 (patch) | |
| tree | 1076140e2e51da648a9f8dcc35a5f2e8a95a0240 /fs/btrfs/compression.c | |
| parent | 301fd5c13257862df66c81c48d963d474e63e0ef (diff) | |
| parent | 7a5deff68f9e0a1db170ac9dd3b2b4aaddc1b80c (diff) | |
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
* 'lpc32xx/core' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Remove board specific GPIO init
ARM: LPC32xx: Provide DMA filter callbacks via platform data
ARM: LPC32xx: Use handle_edge_irq() callback on edge type irqs
+ sync to 3.6-rc4
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 86eff48dab7..43d1c5a3a03 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -818,6 +818,7 @@ static void free_workspace(int type, struct list_head *workspace) btrfs_compress_op[idx]->free_workspace(workspace); atomic_dec(alloc_workspace); wake: + smp_mb(); if (waitqueue_active(workspace_wait)) wake_up(workspace_wait); } |