diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:40 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:28 -0400 |
commit | 6114eab535ab49239e0a6ce08eb9243664aef993 (patch) | |
tree | cb699cfc9f29eb80105f6513fc4679b5ade5df46 /net/rds/ib_recv.c | |
parent | 0352bc550cfa536e4fa2c0e906359bcd5687afff (diff) |
rds: remove the second argument of k[un]map_atomic()
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'net/rds/ib_recv.c')
-rw-r--r-- | net/rds/ib_recv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c index e29e0ca32f74..744a00dd29c3 100644 --- a/net/rds/ib_recv.c +++ b/net/rds/ib_recv.c | |||
@@ -763,7 +763,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn, | |||
763 | to_copy = min(RDS_FRAG_SIZE - frag_off, PAGE_SIZE - map_off); | 763 | to_copy = min(RDS_FRAG_SIZE - frag_off, PAGE_SIZE - map_off); |
764 | BUG_ON(to_copy & 7); /* Must be 64bit aligned. */ | 764 | BUG_ON(to_copy & 7); /* Must be 64bit aligned. */ |
765 | 765 | ||
766 | addr = kmap_atomic(sg_page(&frag->f_sg), KM_SOFTIRQ0); | 766 | addr = kmap_atomic(sg_page(&frag->f_sg)); |
767 | 767 | ||
768 | src = addr + frag_off; | 768 | src = addr + frag_off; |
769 | dst = (void *)map->m_page_addrs[map_page] + map_off; | 769 | dst = (void *)map->m_page_addrs[map_page] + map_off; |
@@ -773,7 +773,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn, | |||
773 | uncongested |= ~(*src) & *dst; | 773 | uncongested |= ~(*src) & *dst; |
774 | *dst++ = *src++; | 774 | *dst++ = *src++; |
775 | } | 775 | } |
776 | kunmap_atomic(addr, KM_SOFTIRQ0); | 776 | kunmap_atomic(addr); |
777 | 777 | ||
778 | copied += to_copy; | 778 | copied += to_copy; |
779 | 779 | ||
@@ -919,8 +919,7 @@ static void rds_ib_process_recv(struct rds_connection *conn, | |||
919 | rds_ib_cong_recv(conn, ibinc); | 919 | rds_ib_cong_recv(conn, ibinc); |
920 | else { | 920 | else { |
921 | rds_recv_incoming(conn, conn->c_faddr, conn->c_laddr, | 921 | rds_recv_incoming(conn, conn->c_faddr, conn->c_laddr, |
922 | &ibinc->ii_inc, GFP_ATOMIC, | 922 | &ibinc->ii_inc, GFP_ATOMIC); |
923 | KM_SOFTIRQ0); | ||
924 | state->ack_next = be64_to_cpu(hdr->h_sequence); | 923 | state->ack_next = be64_to_cpu(hdr->h_sequence); |
925 | state->ack_next_valid = 1; | 924 | state->ack_next_valid = 1; |
926 | } | 925 | } |