1 files changed, 3 insertions, 3 deletions

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index c8f60ee183b5..c21df71943a6 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -627,7 +627,7 @@ static int journal_list_still_alive(struct super_block *s,
 static void release_buffer_page(struct buffer_head *bh)
 {
         struct page *page = bh->b_page;
-        if (!page->mapping && !TestSetPageLocked(page)) {
+        if (!page->mapping && trylock_page(page)) {
                 page_cache_get(page);
                 put_bh(bh);
                 if (!page->mapping)
@@ -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);