diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index ed92c7d3637872829b07a488c9c90d38023a93f7..493b74ca5648b69d676dd423ede90a24c5c6e452 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -617,8 +617,10 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin)
 		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
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 0cc7eddb077fef5e23d8bbd07bf815cec2bda00b..de02ed5e25c2ad09919cf84c23c69b2383e55360 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1805,8 +1805,10 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
 	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;
+		}
 	}
 
 	rc = cifs_revalidate_dentry_attr(dentry);