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>,
	Greg Kroah-Hartman <gregkh@suse.de>,
	Seth Jennings <sjenning@linux.vnet.ibm.com>,
	Dan Magenheimer <dan.magenheimer@oracle.com>,
	Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>,
	Dave Hansen <dave@linux.vnet.ibm.com>,
	devel@driverdev.osuosl.org
Subject: [PATCH 59/62] zcache: remove the second argument of k[un]map_atomic()
Date: Sun, 27 Nov 2011 13:27:39 +0800	[thread overview]
Message-ID: <1322371662-26166-60-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/staging/zcache/zcache-main.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 56c1f9c..487c4f3 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -422,13 +422,13 @@ static int zbud_decompress(struct page *page, struct zbud_hdr *zh)
 	}
 	ASSERT_SENTINEL(zh, ZBH);
 	BUG_ON(zh->size == 0 || zh->size > zbud_max_buddy_size());
-	to_va = kmap_atomic(page, KM_USER0);
+	to_va = kmap_atomic(page);
 	size = zh->size;
 	from_va = zbud_data(zh, size);
 	ret = lzo1x_decompress_safe(from_va, size, to_va, &out_len);
 	BUG_ON(ret != LZO_E_OK);
 	BUG_ON(out_len != PAGE_SIZE);
-	kunmap_atomic(to_va, KM_USER0);
+	kunmap_atomic(to_va);
 out:
 	spin_unlock(&zbpg->lock);
 	return ret;
@@ -677,13 +677,13 @@ static struct zv_hdr *zv_create(struct xv_pool *xvpool, uint32_t pool_id,
 		goto out;
 	zv_curr_dist_counts[chunks]++;
 	zv_cumul_dist_counts[chunks]++;
-	zv = kmap_atomic(page, KM_USER0) + offset;
+	zv = kmap_atomic(page) + offset;
 	zv->index = index;
 	zv->oid = *oid;
 	zv->pool_id = pool_id;
 	SET_SENTINEL(zv, ZVH);
 	memcpy((char *)zv + sizeof(struct zv_hdr), cdata, clen);
-	kunmap_atomic(zv, KM_USER0);
+	kunmap_atomic(zv);
 out:
 	return zv;
 }
@@ -719,10 +719,10 @@ static void zv_decompress(struct page *page, struct zv_hdr *zv)
 	ASSERT_SENTINEL(zv, ZVH);
 	size = xv_get_object_size(zv) - sizeof(*zv);
 	BUG_ON(size == 0);
-	to_va = kmap_atomic(page, KM_USER0);
+	to_va = kmap_atomic(page);
 	ret = lzo1x_decompress_safe((char *)zv + sizeof(*zv),
 					size, to_va, &clen);
-	kunmap_atomic(to_va, KM_USER0);
+	kunmap_atomic(to_va);
 	BUG_ON(ret != LZO_E_OK);
 	BUG_ON(clen != PAGE_SIZE);
 }
@@ -1301,12 +1301,12 @@ static int zcache_compress(struct page *from, void **out_va, size_t *out_len)
 	BUG_ON(!irqs_disabled());
 	if (unlikely(dmem == NULL || wmem == NULL))
 		goto out;  /* no buffer, so can't compress */
-	from_va = kmap_atomic(from, KM_USER0);
+	from_va = kmap_atomic(from);
 	mb();
 	ret = lzo1x_1_compress(from_va, PAGE_SIZE, dmem, out_len, wmem);
 	BUG_ON(ret != LZO_E_OK);
 	*out_va = dmem;
-	kunmap_atomic(from_va, KM_USER0);
+	kunmap_atomic(from_va);
 	ret = 1;
 out:
 	return ret;
-- 
1.7.4.4


  parent reply	other threads:[~2011-11-27  5:39 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 ` [PATCH 27/62] target: " Cong Wang
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 ` Cong Wang [this message]
2011-11-27  9:34   ` [PATCH 59/62] zcache: " 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-60-git-send-email-amwang@redhat.com \
    --to=amwang@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=cascardo@holoscopio.com \
    --cc=dan.magenheimer@oracle.com \
    --cc=dave@linux.vnet.ibm.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sjenning@linux.vnet.ibm.com \
    /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®