X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fjbd%2Fcommit.c;h=ae08c057e751454ad2f0d922faa9be08d3c6d80d;hb=ca6d1b1333bc2e61e37982de1f28d8604c232414;hp=81a9ad7177ca3df1d47c2dc2671ca104fa23c78e;hpb=529ae9aaa08378cfe2a4350bded76f32cc8ff0ce;p=linux-2.6

diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 81a9ad7177..ae08c057e7 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -221,7 +221,7 @@ write_out_data:
 		 * blocking lock_buffer().
 		 */
 		if (buffer_dirty(bh)) {
-			if (test_set_buffer_locked(bh)) {
+			if (!trylock_buffer(bh)) {
 				BUFFER_TRACE(bh, "needs blocking lock");
 				spin_unlock(&journal->j_list_lock);
 				/* Write out all data to prevent deadlocks */