projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
net
/
rds
/
page.c
diff --git
a/net/rds/page.c
b/net/rds/page.c
index 616f21f4e7d7c9f9987c1a0206bab68e589040d7..e2b5a5832d3d52888f11e8730a27d937510e151d 100644
(file)
--- a/
net/rds/page.c
+++ b/
net/rds/page.c
@@
-135,8
+135,8
@@
int rds_page_remainder_alloc(struct scatterlist *scat, unsigned long bytes,
if (rem->r_offset != 0)
rds_stats_inc(s_page_remainder_hit);
- rem->r_offset +=
bytes
;
- if (rem->r_offset
=
= PAGE_SIZE) {
+ rem->r_offset +=
ALIGN(bytes, 8)
;
+ if (rem->r_offset
>
= PAGE_SIZE) {
__free_page(rem->r_page);
rem->r_page = NULL;
}
This page took
0.02538 seconds
and
5
git commands to generate.