From 3b145b2e426375b15a56f1cf53a40ff806648917 Mon Sep 17 00:00:00 2001 From: Steve French Date: Thu, 9 Jun 2005 14:44:07 -0700 Subject: [PATCH] --- yaml --- r: 1954 b: refs/heads/master c: 3079ca621e9e09f4593c20a9a2f24237c355f683 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 3 ++- trunk/fs/cifs/file.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0c4c00447d54..c543a155369b 100644 --- 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 index 95483baab706..dab4774ee7bb 100644 --- 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 index dde2d251fc3d..30ab70ce5547 100644 --- 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; }