summaryrefslogtreecommitdiff
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-10 20:35:10 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-10 20:35:10 -0700
commit27198d855abbfc82df69e81b6c8d2f333580114c (patch)
tree944bb3e49bfc40387c70686a68c4b90c7edf4549 /fs/cifs/file.c
parenta7df849c67f0a5248693e432d03f738e84d6826c (diff)
parentf5d9b97ee0d6d00a29bf881263510d74291fb862 (diff)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r--fs/cifs/file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index dde2d251fc3d..30ab70ce5547 100644
--- a/fs/cifs/file.c
+++ b/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;
}