diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-13 13:25:38 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-13 13:25:38 -0500 |
| commit | 5893a65711164e42fea4a58bb8adf47c2fac8a4b (patch) | |
| tree | 31b5f20e314aae236b06998de3fffeb729581af5 /fs/cifs | |
| parent | d6e04ae64c6b06ef76a5d4fb49106b393b7fa50a (diff) | |
| parent | c0105338eb4e61e537ca34ae06921177cb6efcf0 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/CHANGES | 3 | ||||
| -rw-r--r-- | fs/cifs/file.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index 95483baab70..dab4774ee7b 100644 --- a/fs/cifs/CHANGES +++ b/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/fs/cifs/file.c b/fs/cifs/file.c index ca74c1151be..0cec0e76d85 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1365,6 +1365,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; } |