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/xfs/linux-2.6/xfs_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/xfs/linux-2.6/xfs_aops.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index fa73179233ad..fa47e43b8b41 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -1104,7 +1104,7 @@ xfs_page_state_convert( | |||
1104 | * that we are writing into for the first time. | 1104 | * that we are writing into for the first time. |
1105 | */ | 1105 | */ |
1106 | type = IOMAP_NEW; | 1106 | type = IOMAP_NEW; |
1107 | if (!test_and_set_bit(BH_Lock, &bh->b_state)) { | 1107 | if (trylock_buffer(bh)) { |
1108 | ASSERT(buffer_mapped(bh)); | 1108 | ASSERT(buffer_mapped(bh)); |
1109 | if (iomap_valid) | 1109 | if (iomap_valid) |
1110 | all_bh = 1; | 1110 | all_bh = 1; |