Merge branch 'afs-dh' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[uclinux-h8/linux.git] / fs / afs / write.c

diff --git a/fs/afs/write.c b/fs/afs/write.c
index 160f6cc..c164698 100644 (file)
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -585,10 +585,11 @@ static int afs_writepages_region(struct address_space *mapping,
 
                _debug("wback %lx", page->index);
 
-               /* at this point we hold neither mapping->tree_lock nor lock on
-                * the page itself: the page may be truncated or invalidated
-                * (changing page->mapping to NULL), or even swizzled back from
-                * swapper_space to tmpfs file mapping
+               /*
+                * at this point we hold neither the i_pages lock nor the
+                * page lock: the page may be truncated or invalidated
+                * (changing page->mapping to NULL), or even swizzled
+                * back from swapper_space to tmpfs file mapping
                 */
                ret = lock_page_killable(page);
                if (ret < 0) {