From: Cong Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Cong Wang <amwang@redhat.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dan Magenheimer <dan.magenheimer@oracle.com>,
Seth Jennings <sjenning@linux.vnet.ibm.com>,
Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
devel@driverdev.osuosl.org
Subject: [PATCH 57/60] zcache: remove the second argument of k[un]map_atomic()
Date: Fri, 10 Feb 2012 13:40:18 +0800 [thread overview]
Message-ID: <1328852421-19678-58-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1328852421-19678-1-git-send-email-amwang@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
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 ef7c52b..f0843e8a 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -421,13 +421,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;
@@ -676,13 +676,13 @@ static struct zv_hdr *zv_create(struct xv_pool *xvpool, uint32_t pool_id,
goto out;
atomic_inc(&zv_curr_dist_counts[chunks]);
atomic_inc(&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;
}
@@ -718,10 +718,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);
}
@@ -1300,12 +1300,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.7.6
next prev parent reply other threads:[~2012-02-10 5:48 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 ` [PATCH 25/60] target: " Cong Wang
2012-02-10 22:18 ` 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 ` Cong Wang [this message]
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-58-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=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=konrad.wilk@oracle.com \
--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®