---

yaml --- r: 1954 b: refs/heads/master c: 3079ca6 h: refs/heads/master v: v3
git-mirror · Jun 9, 2005 · 3b145b2 · 3b145b2
1 parent 1385695
commit 3b145b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b68177ccd12866d9f19cafad212b861c9d02a8c
+refs/heads/master: 3079ca621e9e09f4593c20a9a2f24237c355f683
diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES
@@ -6,7 +6,8 @@ kills the cifsd thread (NB: killing the cifs kernel threads is not
 recommended, unmount and rmmod cifs will kill them when they are
 no longer needed).  Fix readdir to ASCII servers (ie older servers
 which do not support Unicode) and also require asterik.
-
+Fix out of memory case in which data could be written one page
+off in the page cache.
 
 Version 1.33
 ------------

diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
@@ -1352,6 +1352,8 @@ static void cifs_copy_cache_pages(struct address_space *mapping,
 				      GFP_KERNEL)) {
 			page_cache_release(page);
 			cFYI(1, ("Add page cache failed"));
+			data += PAGE_CACHE_SIZE;
+			bytes_read -= PAGE_CACHE_SIZE;
 			continue;
 		}