diff options
| author | Nick Piggin <npiggin@suse.de> | 2008-08-02 12:02:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 21:56:09 -0700 |
| commit | ca5de404ff036a29b25e9a83f6919c9f606c5841 (patch) | |
| tree | 474da867c4d4086313cee90cdc3560bb17fade96 /fs/jbd/commit.c | |
| parent | 529ae9aaa08378cfe2a4350bded76f32cc8ff0ce (diff) | |
| download | kernel_samsung_espresso10-ca5de404ff036a29b25e9a83f6919c9f606c5841.zip kernel_samsung_espresso10-ca5de404ff036a29b25e9a83f6919c9f606c5841.tar.gz kernel_samsung_espresso10-ca5de404ff036a29b25e9a83f6919c9f606c5841.tar.bz2 | |
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/commit.c')
| -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 81a9ad71..ae08c05 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 */ |