diff --git a/[refs] b/[refs]
index db84c466a52a..d61ccdcc35a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e659c63998881e8f4a842edbe86ac8c5cdaee41
+refs/heads/master: f7b2e8c76b3423a1d2501b9399261e9c9a33e100
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index 4b07a8cc4633..2436ed8fc840 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -498,7 +498,8 @@ int cifs_close(struct inode *inode, struct file *file)
 					msleep(timeout);
 					timeout *= 4;
 				}
-				cERROR(1,("close with pending writes")); 
+				if(atomic_read(&pSMBFile->wrtPending))
+					cERROR(1,("close with pending writes"));
 				rc = CIFSSMBClose(xid, pTcon,
 						  pSMBFile->netfid);
 			}