From: Li Zefan <lizf@cn.fujitsu.com>
To: Chris Mason <chris.mason@oracle.com>
Cc: Mitch Harder <mitch.harder@sabayonlinux.org>,
linux-btrfs@vger.kernel.org
Subject: [PATCH v2 1/6] btrfs: Fix bugs in zlib workspace
Date: Thu, 18 Nov 2010 10:09:32 +0800 [thread overview]
Message-ID: <4CE48ADC.6070001@cn.fujitsu.com> (raw)
In-Reply-To: <4CE48ABB.5070302@cn.fujitsu.com>
- Fix a race that can result in alloc_workspace > cpus.
- Fix to check num_workspace after wakeup.
Tested-by: Mitch Harder <mitch.harder@sabayonlinux.org>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
fs/btrfs/zlib.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index b9cd544..e5b8b22 100644
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -75,16 +75,19 @@ again:
return workspace;
}
- spin_unlock(&workspace_lock);
if (atomic_read(&alloc_workspace) > cpus) {
DEFINE_WAIT(wait);
+
+ spin_unlock(&workspace_lock);
prepare_to_wait(&workspace_wait, &wait, TASK_UNINTERRUPTIBLE);
- if (atomic_read(&alloc_workspace) > cpus)
+ if (atomic_read(&alloc_workspace) > cpus && !num_workspace)
schedule();
finish_wait(&workspace_wait, &wait);
goto again;
}
atomic_inc(&alloc_workspace);
+ spin_unlock(&workspace_lock);
+
workspace = kzalloc(sizeof(*workspace), GFP_NOFS);
if (!workspace) {
ret = -ENOMEM;
-- 1.7.3.1
next prev parent reply other threads:[~2010-11-18 2:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-18 2:08 [GIT PULL][PATCH v2 0/6] btrfs: Add lzo compression support Li Zefan
2010-11-18 2:09 ` Li Zefan [this message]
2010-11-18 2:10 ` [PATCH v2 2/6] btrfs: Fix error handling in zlib Li Zefan
2010-11-18 2:10 ` [PATCH v2 3/6] btrfs: Allow to add new compression algorithm Li Zefan
2010-11-18 2:10 ` [PATCH v2 4/6] btrfs: Add lzo compression support Li Zefan
2010-11-18 2:11 ` [PATCH v2 5/6] btrfs: Allow to specify compress method when defrag Li Zefan
2010-11-18 2:11 ` [PATCH v2 6/6] btrfs: Extract duplicate decompress code Li Zefan
2010-11-29 17:54 ` [GIT PULL][PATCH v2 0/6] btrfs: Add lzo compression support C Anthony Risinger
2010-11-30 1:00 ` Li Zefan
2010-11-30 17:12 ` C Anthony Risinger
2010-12-01 1:02 ` Li Zefan
2010-12-24 5:35 ` cwillu
2010-12-24 6:55 ` Li Zefan
2010-12-24 12:32 ` Chris Mason
2010-12-24 20:45 ` Chris Mason
2010-12-26 3:31 ` C Anthony Risinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CE48ADC.6070001@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=chris.mason@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=mitch.harder@sabayonlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.