Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index d40738d2ab58c1183a7f940c7d5d086583d0a1e1..ff14d14903a0c182667d757eadc390f3a509cc93 100644 (file)
--- 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)) {