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: 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>,
	James Bottomley <jbottomley@parallels.com>,
	linux-scsi@vger.kernel.org, target-devel@vger.kernel.org
Subject: [PATCH 27/62] target: remove the second argument of k[un]map_atomic()
Date: Sun, 27 Nov 2011 13:27:07 +0800	[thread overview]
Message-ID: <1322371662-26166-28-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1322371662-26166-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 3400ae6..b4a59d8 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2382,7 +2382,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;
 
@@ -2390,7 +2390,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 1369b1c..1a2ff72 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -149,14 +149,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;
 		}
 
@@ -294,14 +293,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.4.4


  parent reply	other threads:[~2011-11-27  5:34 UTC|newest]

Thread overview: 121+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-27  5:26 [V2 PATCH 00/62] highmem: remove the second argument of kmap_atomic/kunmap_atomic Cong Wang
2011-11-27  5:26 ` [PATCH 01/62] highmem: mark k[un]map_atomic() with two arguments as deprecated Cong Wang
2011-11-27 12:34   ` Cesar Eduardo Barros
2011-11-28  5:07     ` Cong Wang
2011-11-28  7:46   ` [UPDATED PATCH " Cong Wang
2011-11-27  5:26 ` [PATCH 02/62] include/linux/highmem.h: remove the second argument of k[un]map_atomic() Cong Wang
2011-11-27  5:26 ` [PATCH 03/62] arm: " Cong Wang
2011-12-10 21:46   ` Russell King - ARM Linux
2011-11-27  5:26 ` [PATCH 04/62] mips: " Cong Wang
2011-12-09 16:06   ` Ralf Baechle
2011-12-12  2:52     ` Cong Wang
2011-11-27  5:26 ` [PATCH 05/62] powerpc: " Cong Wang
2011-11-27  5:26 ` [PATCH 06/62] sh: " Cong Wang
2011-11-27  5:26 ` [PATCH 07/62] um: " Cong Wang
2011-11-27  5:26 ` [PATCH 08/62] x86: " Cong Wang
2011-11-28 12:35   ` Avi Kivity
2011-11-28 12:47   ` Herbert Xu
2011-11-27  5:26 ` [PATCH 09/62] crypto: " Cong Wang
2011-11-27  5:26 ` [PATCH 10/62] ata: " Cong Wang
2011-11-27 18:40   ` Jeff Garzik
2011-11-28 10:01   ` Sergei Shtylyov
2011-11-28 11:42     ` Cong Wang
2011-11-28 11:49       ` Cong Wang
2011-11-28 19:00         ` James Bottomley
2011-11-29  3:25           ` Cong Wang
2011-11-27  5:26 ` [PATCH 11/62] block: " Cong Wang
2011-11-27  5:26 ` [PATCH 12/62] crypto: " Cong Wang
2011-11-27  5:26 ` [PATCH 13/62] edac: " Cong Wang
2011-11-27  5:26 ` [PATCH 14/62] drm: " Cong Wang
2011-11-27  5:26 ` [PATCH 15/62] ide: " Cong Wang
2011-11-27  6:12   ` David Miller
2011-11-27  5:26 ` [PATCH 16/62] infiniband: " Cong Wang
2011-11-28  7:38   ` Roland Dreier
2011-11-28  7:45     ` Cong Wang
2011-11-27  5:26 ` [PATCH 17/62] md: " Cong Wang
2011-11-27  6:00   ` NeilBrown
2011-11-27 10:27     ` [dm-devel] " Milan Broz
2011-11-28  5:10       ` Cong Wang
2011-11-28  7:47     ` [UPDATED PATCH " Cong Wang
2011-11-27  5:26 ` [PATCH 18/62] media: " Cong Wang
2011-11-27 23:10   ` Andy Walls
2011-11-27  5:26 ` [PATCH 19/62] memstick: " Cong Wang
2011-11-27  5:27 ` [PATCH 20/62] mmc: " Cong Wang
2011-11-27 21:02   ` Guennadi Liakhovetski
2011-11-30 23:51   ` David Brown
2011-12-01 18:47   ` Chris Ball
2011-12-02  2:10     ` Cong Wang
2011-11-27  5:27 ` [PATCH 21/62] net: " Cong Wang
2011-11-27  6:12   ` David Miller
2011-11-27  8:07   ` Eric Dumazet
2011-11-28 18:06     ` Alexander Duyck
2011-11-28 18:26       ` Eric Dumazet
2011-11-28  7:39   ` Cong Wang
2011-11-28  7:48   ` [UPDATED PATCH " Cong Wang
2011-11-27  5:27 ` [PATCH 23/62] hv: " Cong Wang
2011-11-27  9:34   ` Greg KH
2011-11-27  5:27 ` [PATCH 24/62] pohmelfs: " Cong Wang
2011-11-27  9:34   ` Greg KH
2011-11-28  0:58     ` Evgeniy Polyakov
2011-11-27  5:27 ` [PATCH 25/62] rtl8192u: " Cong Wang
2011-11-27  9:34   ` Greg KH
2011-11-27  5:27 ` [PATCH 26/62] zram: " Cong Wang
2011-11-27  9:34   ` Greg KH
2011-11-27  5:27 ` Cong Wang [this message]
2011-11-27  5:27 ` [PATCH 28/62] vhost: " Cong Wang
2011-11-27  5:27 ` [PATCH 29/62] fs: " Cong Wang
2011-11-28  2:36   ` Benjamin LaHaise
2011-11-27  5:27 ` [PATCH 30/62] btrfs: " Cong Wang
2011-11-27  5:27 ` [PATCH 31/62] ecryptfs: " Cong Wang
2011-11-27  5:27 ` [PATCH 32/62] afs: " Cong Wang
2011-11-27  5:27 ` [PATCH 33/62] exofs: " Cong Wang
2011-11-28 17:35   ` Boaz Harrosh
2011-11-27  5:27 ` [PATCH 34/62] ext2: " Cong Wang
2011-11-28 14:15   ` Jan Kara
2011-11-27  5:27 ` [PATCH 35/62] fuse: " Cong Wang
2011-11-27  5:27 ` [PATCH 36/62] gfs2: " Cong Wang
2011-11-27  5:27 ` [PATCH 37/62] jbd: " Cong Wang
2011-11-28 14:15   ` Jan Kara
2011-11-27  5:27 ` [PATCH 38/62] jbd2: " Cong Wang
2011-11-27  5:27 ` [PATCH 39/62] logfs: " Cong Wang
2011-11-27  5:27 ` [PATCH 40/62] minix: " Cong Wang
2011-11-27  5:27 ` [PATCH 41/62] nfs: " Cong Wang
2011-11-27  5:27 ` [PATCH 42/62] nilfs2: " Cong Wang
2011-11-28 16:14   ` Ryusuke Konishi
2011-11-27  5:27 ` [PATCH 43/62] ntfs: " Cong Wang
2011-11-27  5:27 ` [PATCH 44/62] ocfs2: " Cong Wang
2011-12-01 20:18   ` Joel Becker
2011-12-02  2:04     ` Cong Wang
2011-12-02  2:29       ` Andrew Morton
2011-12-02  2:38         ` Cong Wang
2011-11-27  5:27 ` [PATCH 45/62] reiserfs: " Cong Wang
2011-11-27  5:27 ` [PATCH 46/62] squashfs: " Cong Wang
2011-11-27  5:27 ` [PATCH 47/62] ubifs: " Cong Wang
2011-11-27  5:27 ` [PATCH 48/62] udf: " Cong Wang
2011-11-28 14:16   ` Jan Kara
2011-11-27  5:27 ` [PATCH 49/62] kdb: " Cong Wang
2011-11-27  5:27 ` [PATCH 50/62] power: " Cong Wang
2011-11-27 11:38   ` Rafael J. Wysocki
2011-11-27  5:27 ` [PATCH 51/62] lib: " Cong Wang
2011-11-27  5:27 ` [PATCH 52/62] mm: " Cong Wang
2011-11-27  5:27 ` [PATCH 53/62] net: " Cong Wang
2011-11-27  6:12   ` David Miller
2011-11-27  5:27 ` [PATCH 54/62] rds: " Cong Wang
2011-11-27  6:13   ` David Miller
2011-11-27  5:27 ` [PATCH 55/62] sunrpc: " Cong Wang
2011-11-27  5:27 ` [PATCH 56/62] tomoyo: " Cong Wang
2011-11-27  5:27 ` [PATCH 57/62] md: " Cong Wang
2011-11-28  7:50   ` [UPDATED PATCH 57/62] dm: " Cong Wang
2011-11-27  5:27 ` [PATCH 58/62] gma500: " Cong Wang
2011-11-28 11:33   ` Alan Cox
2011-11-27  5:27 ` [PATCH 59/62] zcache: " Cong Wang
2011-11-27  9:34   ` Greg KH
2011-11-27  5:27 ` [PATCH 60/62] drbd: " Cong Wang
2011-11-27  5:27 ` [PATCH 61/62] highmem: kill all __kmap_atomic() Cong Wang
2011-12-09 16:07   ` Ralf Baechle
2011-11-27  5:27 ` [PATCH 62/62] feature-removal-schedule.txt: add the deprecated form of kmap_atomic() Cong Wang
2011-11-27 22:21 ` [V2 PATCH 00/62] highmem: remove the second argument of kmap_atomic/kunmap_atomic Benjamin Herrenschmidt
2011-11-28  4:34   ` Benjamin Herrenschmidt
2011-11-28  5:34     ` Cong Wang
2011-11-28  7:42   ` Cong Wang
2011-11-29  3:36 ` Cong Wang

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=1322371662-26166-28-git-send-email-amwang@redhat.com \
    --to=amwang@redhat.com \
    --cc=agrover@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=hch@lst.de \
    --cc=jbottomley@parallels.com \
    --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®