Commit ca747d61 authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

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



Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent ba82fe2e

drivers/target/target_core_transport.c

+2 −2
Original line number Diff line number Diff line
@@ -2344,7 +2344,7 @@ static void transport_xor_callback(struct se_cmd *cmd) 


	offset = 0;

	for_each_sg(cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, count) {

		addr = kmap_atomic(sg_page(sg), KM_USER0);

		addr = kmap_atomic(sg_page(sg));

		if (!addr)

			goto out;
@@ -2352,7 +2352,7 @@ static void transport_xor_callback(struct se_cmd *cmd) 
			*(addr + sg->offset + i) ^= *(buf + offset + i);



		offset += sg->length;

		kunmap_atomic(addr, KM_USER0);

		kunmap_atomic(addr);

	}



out:

drivers/target/tcm_fc/tfc_io.c

+4 −6
Original line number Diff line number Diff line
@@ -146,14 +146,13 @@ int ft_queue_data_in(struct se_cmd *se_cmd) 
					PAGE_SIZE << compound_order(page);

		} else {

			BUG_ON(!page);

			from = kmap_atomic(page + (mem_off >> PAGE_SHIFT),

					   KM_SOFTIRQ0);

			from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));

			page_addr = from;

			from += mem_off & ~PAGE_MASK;

			tlen = min(tlen, (size_t)(PAGE_SIZE -

						(mem_off & ~PAGE_MASK)));

			memcpy(to, from, tlen);

			kunmap_atomic(page_addr, KM_SOFTIRQ0);

			kunmap_atomic(page_addr);

			to += tlen;

		}
@@ -291,14 +290,13 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp) 


		tlen = min(mem_len, frame_len);



		to = kmap_atomic(page + (mem_off >> PAGE_SHIFT),

				 KM_SOFTIRQ0);

		to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));

		page_addr = to;

		to += mem_off & ~PAGE_MASK;

		tlen = min(tlen, (size_t)(PAGE_SIZE -

					  (mem_off & ~PAGE_MASK)));

		memcpy(to, from, tlen);

		kunmap_atomic(page_addr, KM_SOFTIRQ0);

		kunmap_atomic(page_addr);



		from += tlen;

		frame_len -= tlen;