summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-01-12 10:52:28 -0800
committerAndy Grover <andy.grover@oracle.com>2010-09-08 18:11:43 -0700
commitd22faec22c2ab2364fd8fc3c8159b0b5b28b0fd1 (patch)
tree90a286b17b500447e413d8d6a1f119f696a06e3c /net
parent40589e74f7ba855f3a887c9d4abe9d100c5b039c (diff)
downloadlinux-d22faec22c2ab2364fd8fc3c8159b0b5b28b0fd1.tar.bz2
RDS: Do not mask address when pinning pages
This does not appear to be necessary. Signed-off-by: Andy Grover <andy.grover@oracle.com>
Diffstat (limited to 'net')
-rw-r--r--net/rds/rdma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index abbc2979e7e5..1929cb8f17d7 100644
--- a/net/rds/rdma.c
+++ b/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;