summaryrefslogtreecommitdiffstats
path: root/fs/jbd
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2008-08-02 12:02:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 21:56:09 -0700
commitca5de404ff036a29b25e9a83f6919c9f606c5841 (patch)
tree474da867c4d4086313cee90cdc3560bb17fade96 /fs/jbd
parent529ae9aaa08378cfe2a4350bded76f32cc8ff0ce (diff)
downloadlinux-stable-ca5de404ff036a29b25e9a83f6919c9f606c5841.tar.gz
linux-stable-ca5de404ff036a29b25e9a83f6919c9f606c5841.tar.bz2
linux-stable-ca5de404ff036a29b25e9a83f6919c9f606c5841.zip
fs: rename buffer trylock
Like the page lock change, this also requires name change, so convert the raw test_and_set bitop to a trylock. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/jbd')
-rw-r--r--fs/jbd/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 81a9ad7177ca..ae08c057e751 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -221,7 +221,7 @@ write_out_data:
* blocking lock_buffer().
*/
if (buffer_dirty(bh)) {
- if (test_set_buffer_locked(bh)) {
+ if (!trylock_buffer(bh)) {
BUFFER_TRACE(bh, "needs blocking lock");
spin_unlock(&journal->j_list_lock);
/* Write out all data to prevent deadlocks */