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>

2 files changed, 3 insertions, 3 deletions

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 192269698a8a..5699171212ae 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -2435,7 +2435,7 @@ static int reiserfs_write_full_page(struct page *page,
                 if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) {
                         lock_buffer(bh);
                 } else {
-                        if (test_set_buffer_locked(bh)) {
+                        if (!trylock_buffer(bh)) {
                                 redirty_page_for_writepage(wbc, page);
                                 continue;
                         }
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index ce2208b27118..c21df71943a6 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -855,7 +855,7 @@ static int write_ordered_buffers(spinlock_t * lock,
                 jh = JH_ENTRY(list->next);
                 bh = jh->bh;
                 get_bh(bh);
-                if (test_set_buffer_locked(bh)) {
+                if (!trylock_buffer(bh)) {
                         if (!buffer_dirty(bh)) {
                                 list_move(&jh->list, &tmp);
                                 goto loop_next;
@@ -3871,7 +3871,7 @@ int reiserfs_prepare_for_journal(struct super_block *p_s_sb,
 {
         PROC_INFO_INC(p_s_sb, journal.prepare);
 
-        if (test_set_buffer_locked(bh)) {
+        if (!trylock_buffer(bh)) {
                 if (!wait)
                         return 0;
                 lock_buffer(bh);