--- zzzz-none-000/linux-2.6.19.2/fs/cifs/file.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/fs/cifs/file.c	2007-01-11 07:38:19.000000000 +0000
@@ -492,14 +492,10 @@
 					the struct would be in each open file,
 					but this should give enough time to 
 					clear the socket */
-#ifdef CONFIG_CIFS_DEBUG2
-					cFYI(1,("close delay, write pending"));
-#endif /* DEBUG2 */
+					cERROR(1,("close with pending writes"));
 					msleep(timeout);
 					timeout *= 4;
-				}
-				if(atomic_read(&pSMBFile->wrtPending))
-					cERROR(1,("close with pending writes"));
+				} 
 				rc = CIFSSMBClose(xid, pTcon,
 						  pSMBFile->netfid);
 			}
@@ -1810,6 +1806,13 @@
 		}
 		if ((rc < 0) || (smb_read_data == NULL)) {
 			cFYI(1, ("Read error in readpages: %d", rc));
+			/* clean up remaing pages off list */
+			while (!list_empty(page_list) && (i < num_pages)) {
+				page = list_entry(page_list->prev, struct page,
+						  lru);
+				list_del(&page->lru);
+				page_cache_release(page);
+			}
 			break;
 		} else if (bytes_read > 0) {
 			pSMBr = (struct smb_com_read_rsp *)smb_read_data;
@@ -1828,7 +1831,13 @@
 				   this case is ok - if we are at server EOF 
 				   we will hit it on next read */
 
-				/* break; */
+			/* while (!list_empty(page_list) && (i < num_pages)) {
+					page = list_entry(page_list->prev, 
+							  struct page, list);
+					list_del(&page->list);
+					page_cache_release(page);
+				}
+				break; */
 			}
 		} else {
 			cFYI(1, ("No bytes read (%d) at offset %lld . "
@@ -1836,6 +1845,14 @@
 				 bytes_read, offset));
 			/* BB turn off caching and do new lookup on 
 			   file size at server? */
+			while (!list_empty(page_list) && (i < num_pages)) {
+				page = list_entry(page_list->prev, struct page,
+						  lru);
+				list_del(&page->lru);
+
+				/* BB removeme - replace with zero of page? */
+				page_cache_release(page);
+			}
 			break;
 		}
 		if (smb_read_data) {