1 files changed, 4 insertions, 4 deletions

diff --git a/net/rds/page.c b/net/rds/page.c
index 5a14e6d6a926..e2b5a5832d3d 100644
--- a/net/rds/page.c
+++ b/net/rds/page.c
@@ -42,8 +42,8 @@ struct rds_page_remainder {
         unsigned long   r_offset;
 };
 
-static DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_page_remainder,
-                                     rds_page_remainders);
+static
+DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_page_remainder, rds_page_remainders);
 
 /*
  * returns 0 on success or -errno on failure.
@@ -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;
                         }