CIFS: Use invalidate_inode_pages2 instead of invalidate_remote_inode (try #4)

Use invalidate_inode_pages2 that don't leave pages even if shrink_page_list()
has a temp ref on them. It prevents a data coherency problem when
cifs_invalidate_mapping didn't invalidate pages but the client thinks that a data
from the cache is uptodate according to an oplock level (exclusive or II).

Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 196ef60780299df0e01a048e0bb1d8bff0dab8ec..fbe7d5858563282060cf75184486fc1b7f9a60dd 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1691,12 +1691,18 @@ cifs_invalidate_mapping(struct inode *inode)
 
        cifs_i->invalid_mapping = false;
 
-       /* write back any cached data */
        if (inode->i_mapping && inode->i_mapping->nrpages != 0) {
+               /* write back any cached data */
                rc = filemap_write_and_wait(inode->i_mapping);
                mapping_set_error(inode->i_mapping, rc);
+               rc = invalidate_inode_pages2(inode->i_mapping);
+               if (rc) {
+                       cERROR(1, "%s: could not invalidate inode %p", __func__,
+                              inode);
+                       cifs_i->invalid_mapping = true;
+               }
        }
-       invalidate_remote_inode(inode);
+
        cifs_fscache_reset_inode_cookie(inode);
 }