summaryrefslogtreecommitdiffstats
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-06-13 13:25:38 -0500
committerSteve French <sfrench@us.ibm.com>2005-06-13 13:25:38 -0500
commit5893a65711164e42fea4a58bb8adf47c2fac8a4b (patch)
tree31b5f20e314aae236b06998de3fffeb729581af5 /fs/cifs/file.c
parentd6e04ae64c6b06ef76a5d4fb49106b393b7fa50a (diff)
parentc0105338eb4e61e537ca34ae06921177cb6efcf0 (diff)
downloadop-kernel-dev-5893a65711164e42fea4a58bb8adf47c2fac8a4b.zip
op-kernel-dev-5893a65711164e42fea4a58bb8adf47c2fac8a4b.tar.gz
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
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 ca74c11..0cec0e7 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;
}
OpenPOWER on IntegriCloud