Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

	include/asm-x86/dma-mapping.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/afs/write.c b/fs/afs/write.c
index 9a849ad3c489..065b4e10681a 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -404,7 +404,7 @@ static int afs_write_back_from_locked_page(struct afs_writeback *wb,
                         page = pages[loop];
                         if (page->index > wb->last)
                                 break;
-                        if (TestSetPageLocked(page))
+                        if (!trylock_page(page))
                                 break;
                         if (!PageDirty(page) ||
                             page_private(page) != (unsigned long) wb) {