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

Commit Message

Pavel Shilovsky Feb. 25, 2011, 10:21 a.m. UTC

None

Patch

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 589f3e3..0011e95 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1687,12 +1687,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) {
-		rc = filemap_write_and_wait(inode->i_mapping);
-		mapping_set_error(inode->i_mapping, rc);
+	if (inode->i_mapping) {
+		/* write back any cached data */
+		if (inode->i_mapping->nrpages != 0) {
+			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);
 	}
-	invalidate_remote_inode(inode);
+
 	cifs_fscache_reset_inode_cookie(inode);
 }