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/ntfs/aops.c | |
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/ntfs/aops.c')
-rw-r--r-- | fs/ntfs/aops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index 00e9ccde8e42..b38f944f0667 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c | |||
@@ -1194,7 +1194,7 @@ lock_retry_remap: | |||
1194 | tbh = bhs[i]; | 1194 | tbh = bhs[i]; |
1195 | if (!tbh) | 1195 | if (!tbh) |
1196 | continue; | 1196 | continue; |
1197 | if (unlikely(test_set_buffer_locked(tbh))) | 1197 | if (!trylock_buffer(tbh)) |
1198 | BUG(); | 1198 | BUG(); |
1199 | /* The buffer dirty state is now irrelevant, just clean it. */ | 1199 | /* The buffer dirty state is now irrelevant, just clean it. */ |
1200 | clear_buffer_dirty(tbh); | 1200 | clear_buffer_dirty(tbh); |