evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

btrfs: Fix bugs in zlib workspace

Browse source 
- Fix a race that can result in alloc_workspace > cpus.
- Fix to check num_workspace after wakeup.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
This commit is contained in:
Li Zefan 2010-10-25 15:11:43 +08:00
parent 83a50de97f
commit 8844355df7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/btrfs/zlib.c
View file

@ -75,16 +75,19 @@ again:
return workspace; return workspace;
} }
spin_unlock(&workspace_lock);
if (atomic_read(&alloc_workspace) > cpus) { if (atomic_read(&alloc_workspace) > cpus) {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
spin_unlock(&workspace_lock);
prepare_to_wait(&workspace_wait, &wait, TASK_UNINTERRUPTIBLE); prepare_to_wait(&workspace_wait, &wait, TASK_UNINTERRUPTIBLE);
if (atomic_read(&alloc_workspace) > cpus) if (atomic_read(&alloc_workspace) > cpus && !num_workspace)
schedule(); schedule();
finish_wait(&workspace_wait, &wait); finish_wait(&workspace_wait, &wait);
goto again; goto again;
} }
atomic_inc(&alloc_workspace); atomic_inc(&alloc_workspace);
spin_unlock(&workspace_lock);
workspace = kzalloc(sizeof(*workspace), GFP_NOFS); workspace = kzalloc(sizeof(*workspace), GFP_NOFS);
if (!workspace) { if (!workspace) {
ret = -ENOMEM; ret = -ENOMEM;