diff options
author | Nick Piggin <npiggin@suse.de> | 2008-08-02 06:02:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 00:56:09 -0400 |
commit | ca5de404ff036a29b25e9a83f6919c9f606c5841 (patch) | |
tree | 474da867c4d4086313cee90cdc3560bb17fade96 /fs/jbd | |
parent | 529ae9aaa08378cfe2a4350bded76f32cc8ff0ce (diff) |
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.c | 2 |
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: | |||
221 | * blocking lock_buffer(). | 221 | * blocking lock_buffer(). |
222 | */ | 222 | */ |
223 | if (buffer_dirty(bh)) { | 223 | if (buffer_dirty(bh)) { |
224 | if (test_set_buffer_locked(bh)) { | 224 | if (!trylock_buffer(bh)) { |
225 | BUFFER_TRACE(bh, "needs blocking lock"); | 225 | BUFFER_TRACE(bh, "needs blocking lock"); |
226 | spin_unlock(&journal->j_list_lock); | 226 | spin_unlock(&journal->j_list_lock); |
227 | /* Write out all data to prevent deadlocks */ | 227 | /* Write out all data to prevent deadlocks */ |