---

yaml --- r: 214383 b: refs/heads/master c: d22faec h: refs/heads/master i: 214381: 86b0154 214379: a254b13 214375: 71a2170 214367: 8bd82dc v: v3
git-mirror · Sep 9, 2010 · d6a7f41 · d6a7f41
1 parent 0974c40
commit d6a7f41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;