Merge tag 'pm-4.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

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

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 7cee97b93a614736e77414162bdf46c432475a40..4bcd4e838b475071f6e054ab9c89891dbef3d6fe 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1987,11 +1987,10 @@ wdata_prepare_pages(struct cifs_writedata *wdata, unsigned int found_pages,
        for (i = 0; i < found_pages; i++) {
                page = wdata->pages[i];
                /*
-                * 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
                 */
 
                if (nr_pages == 0)