diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 19:10:49 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 19:10:49 +0200 |
commit | 80bd6d7f5e0d872a0f5a151473d2a39d95d210a8 (patch) | |
tree | b3a36048d6b7de88f7e906624ecb4b98816bb736 /fs/cifs/file.c | |
parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds... (diff) | |
parent | Merge rsync://oss.sgi.com/git/xfs-2.6 (diff) | |
download | linux-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.tar.xz linux-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 2 |
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; } |