projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[deliverable/linux.git]
/
fs
/
squashfs
/
lzo_wrapper.c
diff --git
a/fs/squashfs/lzo_wrapper.c
b/fs/squashfs/lzo_wrapper.c
index 244b9fbfff7b299195585320328cfc7540e6887e..934c17e965908eccff7e23729f8b9f27a0425628 100644
(file)
--- a/
fs/squashfs/lzo_wrapper.c
+++ b/
fs/squashfs/lzo_wrapper.c
@@
-102,13
+102,13
@@
static int lzo_uncompress(struct squashfs_sb_info *msblk, void *strm,
data = squashfs_first_page(output);
buff = stream->output;
while (data) {
data = squashfs_first_page(output);
buff = stream->output;
while (data) {
- if (bytes <= PAGE_
CACHE_
SIZE) {
+ if (bytes <= PAGE_SIZE) {
memcpy(data, buff, bytes);
break;
} else {
memcpy(data, buff, bytes);
break;
} else {
- memcpy(data, buff, PAGE_
CACHE_
SIZE);
- buff += PAGE_
CACHE_
SIZE;
- bytes -= PAGE_
CACHE_
SIZE;
+ memcpy(data, buff, PAGE_SIZE);
+ buff += PAGE_SIZE;
+ bytes -= PAGE_SIZE;
data = squashfs_next_page(output);
}
}
data = squashfs_next_page(output);
}
}
This page took
0.024327 seconds
and
5
git commands to generate.