X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fntfs%2Faops.c;h=b38f944f0667351b69d947acf0e15660d995834b;hb=d78404cc24dfababd0b594cdca3ecfdd8710869d;hp=00e9ccde8e42b787724bee44aedc432df37e7875;hpb=5531d28504461c4e96c6fbd80655a2bfd6481583;p=linux-2.6-omap-h63xx.git

diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 00e9ccde8e4..b38f944f066 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -1194,7 +1194,7 @@ lock_retry_remap:
 		tbh = bhs[i];
 		if (!tbh)
 			continue;
-		if (unlikely(test_set_buffer_locked(tbh)))
+		if (!trylock_buffer(tbh))
 			BUG();
 		/* The buffer dirty state is now irrelevant, just clean it. */
 		clear_buffer_dirty(tbh);