mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Cong Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Cong Wang <amwang@redhat.com>,
	"Nicholas A. Bellinger" <nab@linux-iscsi.org>,
	Andy Grover <agrover@redhat.com>, Christoph Hellwig <hch@lst.de>,
	Kiran Patil <kiran.patil@intel.com>,
	Jiri Kosina <jkosina@suse.cz>,
	linux-scsi@vger.kernel.org, target-devel@vger.kernel.org
Subject: [PATCH 25/60] target: remove the second argument of k[un]map_atomic()
Date: Fri, 10 Feb 2012 13:39:46 +0800	[thread overview]
Message-ID: <1328852421-19678-26-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1328852421-19678-1-git-send-email-amwang@redhat.com>

Signed-off-by: Cong Wang <amwang@redhat.com>
---
 drivers/target/target_core_transport.c |    4 ++--
 drivers/target/tcm_fc/tfc_io.c         |   10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 58cea07..58c12d7 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -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:
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
index d8cabc2..2b693ee 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -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;
-- 
1.7.7.6


  parent reply	other threads:[~2012-02-10  5:45 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-10  5:39 [Resend PATCH 00/60] highmem: " Cong Wang
2012-02-10  5:39 ` [PATCH 01/60] highmem: mark k[un]map_atomic() with two arguments as deprecated Cong Wang
2012-02-17 23:59   ` Andrew Morton
2012-02-19 14:57     ` Cong Wang
2012-02-10  5:39 ` [PATCH 02/60] include/linux/highmem.h: remove the second argument of k[un]map_atomic() Cong Wang
2012-02-10  5:39 ` [PATCH 03/60] arm: " Cong Wang
2012-02-10  5:39 ` [PATCH 04/60] mips: " Cong Wang
2012-02-10  5:39 ` [PATCH 05/60] powerpc: " Cong Wang
2012-02-10  5:39 ` [PATCH 06/60] sh: " Cong Wang
2012-02-10  5:39 ` [PATCH 07/60] um: " Cong Wang
2012-02-10  5:39 ` [PATCH 08/60] x86: " Cong Wang
2012-02-10  5:39 ` [PATCH 09/60] crypto: " Cong Wang
2012-02-10  5:39 ` [PATCH 10/60] ata: " Cong Wang
2012-02-10  5:39 ` [PATCH 11/60] block: " Cong Wang
2012-02-10  5:39 ` [PATCH 12/60] crypto: " Cong Wang
2012-02-10  5:39 ` [PATCH 13/60] edac: " Cong Wang
2012-02-10  5:39 ` [PATCH 14/60] drm: " Cong Wang
2012-02-10  7:05   ` Thomas Hellstrom
2012-02-10  5:39 ` [PATCH 15/60] ide: " Cong Wang
2012-02-10  5:39 ` [PATCH 16/60] infiniband: " Cong Wang
2012-02-10  5:39 ` [PATCH 17/60] md: " Cong Wang
2012-02-10  5:39 ` [PATCH 18/60] media: " Cong Wang
2012-02-10  5:39 ` [PATCH 19/60] memstick: " Cong Wang
2012-02-10  5:39 ` [PATCH 20/60] net: " Cong Wang
2012-02-10  5:39 ` [PATCH 22/60] hv: " Cong Wang
2012-02-10  5:39 ` [PATCH 23/60] rtl8192u: " Cong Wang
2012-02-10  5:39 ` [PATCH 24/60] zram: " Cong Wang
2012-02-10  5:39 ` Cong Wang [this message]
2012-02-10 22:18   ` [PATCH 25/60] target: " Nicholas A. Bellinger
2012-02-13  7:44     ` Cong Wang
2012-02-10  5:39 ` [PATCH 26/60] vhost: " Cong Wang
2012-02-10  5:39 ` [PATCH 27/60] fs: " Cong Wang
2012-02-10  5:39 ` [PATCH 28/60] btrfs: " Cong Wang
2012-02-10  5:39 ` [PATCH 29/60] ecryptfs: " Cong Wang
2012-02-10 20:16   ` Tyler Hicks
2012-02-13  7:46     ` Cong Wang
2012-02-10  5:39 ` [PATCH 30/60] afs: " Cong Wang
2012-02-10  5:39 ` [PATCH 31/60] exofs: " Cong Wang
2012-02-10  5:39 ` [PATCH 32/60] ext2: " Cong Wang
2012-02-10  5:39 ` [PATCH 33/60] fuse: " Cong Wang
2012-02-10  5:39 ` [PATCH 34/60] gfs2: " Cong Wang
2012-02-10  5:39 ` [PATCH 35/60] jbd: " Cong Wang
2012-02-10  5:39 ` [PATCH 36/60] jbd2: " Cong Wang
2012-02-10  5:39 ` [PATCH 37/60] logfs: " Cong Wang
2012-02-10  5:39 ` [PATCH 38/60] minix: " Cong Wang
2012-02-10  5:40 ` [PATCH 39/60] nfs: " Cong Wang
2012-02-10  5:40 ` [PATCH 40/60] nilfs2: " Cong Wang
2012-02-10  5:40 ` [PATCH 41/60] ntfs: " Cong Wang
2012-02-10  5:40 ` [PATCH 42/60] ocfs2: " Cong Wang
2012-02-10  5:40 ` [PATCH 43/60] reiserfs: " Cong Wang
2012-02-10  5:40 ` [PATCH 44/60] squashfs: " Cong Wang
2012-02-10  5:40 ` [PATCH 45/60] ubifs: " Cong Wang
2012-02-10  5:40 ` [PATCH 46/60] udf: " Cong Wang
2012-02-10  5:40 ` [PATCH 47/60] kdb: " Cong Wang
2012-02-10  5:40 ` [PATCH 48/60] power: " Cong Wang
2012-02-10  5:40 ` [PATCH 49/60] lib: " Cong Wang
2012-02-10  5:40 ` [PATCH 50/60] mm: " Cong Wang
2012-02-10  5:40 ` [PATCH 51/60] net: " Cong Wang
2012-02-10  5:40 ` [PATCH 52/60] rds: " Cong Wang
2012-02-10  5:40 ` [PATCH 53/60] sunrpc: " Cong Wang
2012-02-10  5:40 ` [PATCH 54/60] tomoyo: " Cong Wang
2012-02-10  5:40 ` [PATCH 55/60] dm: " Cong Wang
2012-02-10  5:40 ` [PATCH 56/60] gma500: " Cong Wang
2012-02-10  5:40 ` [PATCH 57/60] zcache: " Cong Wang
2012-02-10  5:40 ` [PATCH 58/60] drbd: " Cong Wang
     [not found]   ` <CA+xKNSgdt7mc2NYTbprFspE54R_4T4PTzyGKyKESqBRyaNCPJg@mail.gmail.com>
2012-02-13  7:43     ` [Drbd-dev] " Cong Wang
2012-02-10  5:40 ` [PATCH 60/60] feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal Cong Wang
     [not found] ` <1328852421-19678-60-git-send-email-amwang@redhat.com>
2012-02-10 13:05   ` [PATCH 59/60] highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename] Chris Metcalf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1328852421-19678-26-git-send-email-amwang@redhat.com \
    --to=amwang@redhat.com \
    --cc=agrover@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=hch@lst.de \
    --cc=jkosina@suse.cz \
    --cc=kiran.patil@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=nab@linux-iscsi.org \
    --cc=target-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®