diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index ed92c7d..493b74c 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -617,8 +617,10 @@
 		if (!CIFS_I(inode)->clientCanCacheRead && inode->i_mapping &&
 		    inode->i_mapping->nrpages != 0) {
 			rc = filemap_fdatawait(inode->i_mapping);
-			mapping_set_error(inode->i_mapping, rc);
-			return rc;
+			if (rc) {
+				mapping_set_error(inode->i_mapping, rc);
+				return rc;
+			}
 		}
 		/*
 		 * Some applications poll for the file length in this strange