diff options
author | 2014-07-07 17:24:10 -0700 | |
---|---|---|
committer | 2014-07-07 17:24:10 -0700 | |
commit | 64c720add08ed48fc7655686c2de6969b043b4c0 (patch) | |
tree | 5c78f45d6089113f7e8f93fad22134646e42b15f /fs/btrfs/compression.c | |
parent | Merge branch 'component-for-driver' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into driver-core-next (diff) | |
parent | Linux 3.16-rc4 (diff) | |
download | wireguard-linux-64c720add08ed48fc7655686c2de6969b043b4c0.tar.xz wireguard-linux-64c720add08ed48fc7655686c2de6969b043b4c0.zip |
Merge 3.16-rc4 into driver-core-next
We want the lz* fixes here to do more work with them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
-rw-r--r-- | fs/btrfs/compression.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 92371c414228..1daea0b47187 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -821,7 +821,7 @@ static void free_workspace(int type, struct list_head *workspace) spin_lock(workspace_lock); if (*num_workspace < num_online_cpus()) { - list_add_tail(workspace, idle_workspace); + list_add(workspace, idle_workspace); (*num_workspace)++; spin_unlock(workspace_lock); goto wake; |