X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fcifs%2Ffile.c;h=ff14d14903a0c182667d757eadc390f3a509cc93;hb=56831a1a883bb8376ea56ce8f3b1d5844c94d257;hp=d40738d2ab58c1183a7f940c7d5d086583d0a1e1;hpb=ad8b15f0ffc297cdd6c65ef7552b3b8abd11a401;p=linux-2.6-omap-h63xx.git

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index d40738d2ab5..ff14d14903a 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1281,7 +1281,7 @@ retry:
 
 			if (first < 0)
 				lock_page(page);
-			else if (TestSetPageLocked(page))
+			else if (!trylock_page(page))
 				break;
 
 			if (unlikely(page->mapping != mapping)) {