Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6114eab5 authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

rds: remove the second argument of k[un]map_atomic() 



Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 0352bc55

net/rds/ib_recv.c

+3 −4
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn, 
		to_copy = min(RDS_FRAG_SIZE - frag_off, PAGE_SIZE - map_off);

		BUG_ON(to_copy & 7); /* Must be 64bit aligned. */



		addr = kmap_atomic(sg_page(&frag->f_sg), KM_SOFTIRQ0);

		addr = kmap_atomic(sg_page(&frag->f_sg));



		src = addr + frag_off;

		dst = (void *)map->m_page_addrs[map_page] + map_off;
@@ -773,7 +773,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn, 
			uncongested |= ~(*src) & *dst;

			*dst++ = *src++;

		}

		kunmap_atomic(addr, KM_SOFTIRQ0);

		kunmap_atomic(addr);



		copied += to_copy;
@@ -919,8 +919,7 @@ static void rds_ib_process_recv(struct rds_connection *conn, 
			rds_ib_cong_recv(conn, ibinc);

		else {

			rds_recv_incoming(conn, conn->c_faddr, conn->c_laddr,

					  &ibinc->ii_inc, GFP_ATOMIC,

					  KM_SOFTIRQ0);

					  &ibinc->ii_inc, GFP_ATOMIC);

			state->ack_next = be64_to_cpu(hdr->h_sequence);

			state->ack_next_valid = 1;

		}

net/rds/info.c

+3 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ EXPORT_SYMBOL_GPL(rds_info_deregister_func); 
void rds_info_iter_unmap(struct rds_info_iterator *iter)

{

	if (iter->addr) {

		kunmap_atomic(iter->addr, KM_USER0);

		kunmap_atomic(iter->addr);

		iter->addr = NULL;

	}

}
@@ -119,7 +119,7 @@ void rds_info_copy(struct rds_info_iterator *iter, void *data, 


	while (bytes) {

		if (!iter->addr)

			iter->addr = kmap_atomic(*iter->pages, KM_USER0);

			iter->addr = kmap_atomic(*iter->pages);



		this = min(bytes, PAGE_SIZE - iter->offset);
@@ -134,7 +134,7 @@ void rds_info_copy(struct rds_info_iterator *iter, void *data, 
		iter->offset += this;



		if (iter->offset == PAGE_SIZE) {

			kunmap_atomic(iter->addr, KM_USER0);

			kunmap_atomic(iter->addr);

			iter->addr = NULL;

			iter->offset = 0;

			iter->pages++;

net/rds/iw_recv.c

+3 −4
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static void rds_iw_cong_recv(struct rds_connection *conn, 
		to_copy = min(RDS_FRAG_SIZE - frag_off, PAGE_SIZE - map_off);

		BUG_ON(to_copy & 7); /* Must be 64bit aligned. */



		addr = kmap_atomic(frag->f_page, KM_SOFTIRQ0);

		addr = kmap_atomic(frag->f_page);



		src = addr + frag_off;

		dst = (void *)map->m_page_addrs[map_page] + map_off;
@@ -608,7 +608,7 @@ static void rds_iw_cong_recv(struct rds_connection *conn, 
			uncongested |= ~(*src) & *dst;

			*dst++ = *src++;

		}

		kunmap_atomic(addr, KM_SOFTIRQ0);

		kunmap_atomic(addr);



		copied += to_copy;
@@ -754,8 +754,7 @@ static void rds_iw_process_recv(struct rds_connection *conn, 
			rds_iw_cong_recv(conn, iwinc);

		else {

			rds_recv_incoming(conn, conn->c_faddr, conn->c_laddr,

					  &iwinc->ii_inc, GFP_ATOMIC,

					  KM_SOFTIRQ0);

					  &iwinc->ii_inc, GFP_ATOMIC);

			state->ack_next = be64_to_cpu(hdr->h_sequence);

			state->ack_next_valid = 1;

		}

net/rds/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int rds_loop_xmit(struct rds_connection *conn, struct rds_message *rm, 
	rds_message_addref(rm);



	rds_recv_incoming(conn, conn->c_laddr, conn->c_faddr, &rm->m_inc,

			  GFP_KERNEL, KM_USER0);

			  GFP_KERNEL);



	rds_send_drop_acked(conn, be64_to_cpu(rm->m_inc.i_hdr.h_sequence),

			    NULL);

net/rds/rds.h

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ void rds_inc_init(struct rds_incoming *inc, struct rds_connection *conn, 
		  __be32 saddr);

void rds_inc_put(struct rds_incoming *inc);

void rds_recv_incoming(struct rds_connection *conn, __be32 saddr, __be32 daddr,

		       struct rds_incoming *inc, gfp_t gfp, enum km_type km);

		       struct rds_incoming *inc, gfp_t gfp);

int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,

		size_t size, int msg_flags);

void rds_clear_recv_queue(struct rds_sock *rs);