From d6a7f4179e9d63e8ba13da345390aad6b5b8615b Mon Sep 17 00:00:00 2001
From: Andy Grover <andy.grover@oracle.com>
Date: Tue, 12 Jan 2010 10:52:28 -0800
Subject: [PATCH] --- yaml --- r: 214383 b: refs/heads/master c:
 d22faec22c2ab2364fd8fc3c8159b0b5b28b0fd1 h: refs/heads/master i:   214381:
 86b0154c7ceb21272bd28d0cc9953136a39651fb   214379:
 a254b13cc31b16ef5105e8c2c541cf355c7b3e9c   214375:
 71a2170d06aef37c00166743dde3e20f312211fe   214367:
 8bd82dc0ee7c80da0cb853cde9c2ec381cf88159 v: v3

---
 [refs]               | 2 +-
 trunk/net/rds/rdma.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9ba2c3bd06ed..e4a3b693f57e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40589e74f7ba855f3a887c9d4abe9d100c5b039c
+refs/heads/master: d22faec22c2ab2364fd8fc3c8159b0b5b28b0fd1
diff --git a/trunk/net/rds/rdma.c b/trunk/net/rds/rdma.c
index abbc2979e7e5..1929cb8f17d7 100644
--- a/trunk/net/rds/rdma.c
+++ b/trunk/net/rds/rdma.c
@@ -238,7 +238,7 @@ static int __rds_rdma_map(struct rds_sock *rs, struct rds_get_mr_args *args,
 	 * r/o or r/w. We need to assume r/w, or we'll do a lot of RDMA to
 	 * the zero page.
 	 */
-	ret = rds_pin_pages(args->vec.addr & PAGE_MASK, nr_pages, pages, 1);
+	ret = rds_pin_pages(args->vec.addr, nr_pages, pages, 1);
 	if (ret < 0)
 		goto out;
 
@@ -595,7 +595,7 @@ static int rds_rdma_prepare(struct rds_message *rm,
 		/* If it's a WRITE operation, we want to pin the pages for reading.
 		 * If it's a READ operation, we need to pin the pages for writing.
 		 */
-		ret = rds_pin_pages(vec.addr & PAGE_MASK, nr, pages, !op->r_write);
+		ret = rds_pin_pages(vec.addr, nr, pages, !op->r_write);
 		if (ret < 0)
 			goto out;