From: NeilBrown <neilb@suse.de>
To: Cong Wang <amwang@redhat.com>
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
linux-raid@vger.kernel.org, dm-devel@redhat.com
Subject: Re: [PATCH 17/62] md: remove the second argument of k[un]map_atomic()
Date: Sun, 27 Nov 2011 17:00:13 +1100 [thread overview]
Message-ID: <20111127170013.20d180a9@notabene.brown> (raw)
In-Reply-To: <1322371662-26166-18-git-send-email-amwang@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 7447 bytes --]
On Sun, 27 Nov 2011 13:26:57 +0800 Cong Wang <amwang@redhat.com> wrote:
>
> Signed-off-by: Cong Wang <amwang@redhat.com>
This and patch 57/62
Acked-by: NeilBrown <neilb@suse.de>
thanks.
Not sure why there are two separate patches to md/bitmap.c though...
... and I cannot offically 'ack' the dm-crypt.c parts of this as I'm not the
maintainer. 'md' and 'dm' are separate systems in the same directory -
confusing, isn't it :-(
NeilBrown
> ---
> drivers/md/bitmap.c | 36 ++++++++++++++++++------------------
> drivers/md/dm-crypt.c | 8 ++++----
> 2 files changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
> index 7878712..8659515 100644
> --- a/drivers/md/bitmap.c
> +++ b/drivers/md/bitmap.c
> @@ -457,7 +457,7 @@ void bitmap_update_sb(struct bitmap *bitmap)
> return;
> }
> spin_unlock_irqrestore(&bitmap->lock, flags);
> - sb = kmap_atomic(bitmap->sb_page, KM_USER0);
> + sb = kmap_atomic(bitmap->sb_page);
> sb->events = cpu_to_le64(bitmap->mddev->events);
> if (bitmap->mddev->events < bitmap->events_cleared)
> /* rocking back to read-only */
> @@ -467,7 +467,7 @@ void bitmap_update_sb(struct bitmap *bitmap)
> /* Just in case these have been changed via sysfs: */
> sb->daemon_sleep = cpu_to_le32(bitmap->mddev->bitmap_info.daemon_sleep/HZ);
> sb->write_behind = cpu_to_le32(bitmap->mddev->bitmap_info.max_write_behind);
> - kunmap_atomic(sb, KM_USER0);
> + kunmap_atomic(sb);
> write_page(bitmap, bitmap->sb_page, 1);
> }
>
> @@ -478,7 +478,7 @@ void bitmap_print_sb(struct bitmap *bitmap)
>
> if (!bitmap || !bitmap->sb_page)
> return;
> - sb = kmap_atomic(bitmap->sb_page, KM_USER0);
> + sb = kmap_atomic(bitmap->sb_page);
> printk(KERN_DEBUG "%s: bitmap file superblock:\n", bmname(bitmap));
> printk(KERN_DEBUG " magic: %08x\n", le32_to_cpu(sb->magic));
> printk(KERN_DEBUG " version: %d\n", le32_to_cpu(sb->version));
> @@ -497,7 +497,7 @@ void bitmap_print_sb(struct bitmap *bitmap)
> printk(KERN_DEBUG " sync size: %llu KB\n",
> (unsigned long long)le64_to_cpu(sb->sync_size)/2);
> printk(KERN_DEBUG "max write behind: %d\n", le32_to_cpu(sb->write_behind));
> - kunmap_atomic(sb, KM_USER0);
> + kunmap_atomic(sb);
> }
>
> /*
> @@ -603,7 +603,7 @@ static int bitmap_read_sb(struct bitmap *bitmap)
> return err;
> }
>
> - sb = kmap_atomic(bitmap->sb_page, KM_USER0);
> + sb = kmap_atomic(bitmap->sb_page);
>
> chunksize = le32_to_cpu(sb->chunksize);
> daemon_sleep = le32_to_cpu(sb->daemon_sleep) * HZ;
> @@ -664,7 +664,7 @@ success:
> bitmap->events_cleared = bitmap->mddev->events;
> err = 0;
> out:
> - kunmap_atomic(sb, KM_USER0);
> + kunmap_atomic(sb);
> if (err)
> bitmap_print_sb(bitmap);
> return err;
> @@ -689,7 +689,7 @@ static int bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits,
> return 0;
> }
> spin_unlock_irqrestore(&bitmap->lock, flags);
> - sb = kmap_atomic(bitmap->sb_page, KM_USER0);
> + sb = kmap_atomic(bitmap->sb_page);
> old = le32_to_cpu(sb->state) & bits;
> switch (op) {
> case MASK_SET:
> @@ -703,7 +703,7 @@ static int bitmap_mask_state(struct bitmap *bitmap, enum bitmap_state bits,
> default:
> BUG();
> }
> - kunmap_atomic(sb, KM_USER0);
> + kunmap_atomic(sb);
> return old;
> }
>
> @@ -881,12 +881,12 @@ static void bitmap_file_set_bit(struct bitmap *bitmap, sector_t block)
> bit = file_page_offset(bitmap, chunk);
>
> /* set the bit */
> - kaddr = kmap_atomic(page, KM_USER0);
> + kaddr = kmap_atomic(page);
> if (bitmap->flags & BITMAP_HOSTENDIAN)
> set_bit(bit, kaddr);
> else
> __set_bit_le(bit, kaddr);
> - kunmap_atomic(kaddr, KM_USER0);
> + kunmap_atomic(kaddr);
> pr_debug("set file bit %lu page %lu\n", bit, page->index);
> /* record page number so it gets flushed to disk when unplug occurs */
> set_page_attr(bitmap, page, BITMAP_PAGE_DIRTY);
> @@ -1050,10 +1050,10 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)
> * if bitmap is out of date, dirty the
> * whole page and write it out
> */
> - paddr = kmap_atomic(page, KM_USER0);
> + paddr = kmap_atomic(page);
> memset(paddr + offset, 0xff,
> PAGE_SIZE - offset);
> - kunmap_atomic(paddr, KM_USER0);
> + kunmap_atomic(paddr);
> write_page(bitmap, page, 1);
>
> ret = -EIO;
> @@ -1061,12 +1061,12 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, sector_t start)
> goto err;
> }
> }
> - paddr = kmap_atomic(page, KM_USER0);
> + paddr = kmap_atomic(page);
> if (bitmap->flags & BITMAP_HOSTENDIAN)
> b = test_bit(bit, paddr);
> else
> b = test_bit_le(bit, paddr);
> - kunmap_atomic(paddr, KM_USER0);
> + kunmap_atomic(paddr);
> if (b) {
> /* if the disk bit is set, set the memory bit */
> int needed = ((sector_t)(i+1) << (CHUNK_BLOCK_SHIFT(bitmap))
> @@ -1207,10 +1207,10 @@ void bitmap_daemon_work(struct mddev *mddev)
> bitmap->mddev->bitmap_info.external == 0) {
> bitmap_super_t *sb;
> bitmap->need_sync = 0;
> - sb = kmap_atomic(bitmap->sb_page, KM_USER0);
> + sb = kmap_atomic(bitmap->sb_page);
> sb->events_cleared =
> cpu_to_le64(bitmap->events_cleared);
> - kunmap_atomic(sb, KM_USER0);
> + kunmap_atomic(sb);
> write_page(bitmap, bitmap->sb_page, 1);
> }
> spin_lock_irqsave(&bitmap->lock, flags);
> @@ -1233,7 +1233,7 @@ void bitmap_daemon_work(struct mddev *mddev)
> -1);
>
> /* clear the bit */
> - paddr = kmap_atomic(page, KM_USER0);
> + paddr = kmap_atomic(page);
> if (bitmap->flags & BITMAP_HOSTENDIAN)
> clear_bit(file_page_offset(bitmap, j),
> paddr);
> @@ -1242,7 +1242,7 @@ void bitmap_daemon_work(struct mddev *mddev)
> file_page_offset(bitmap,
> j),
> paddr);
> - kunmap_atomic(paddr, KM_USER0);
> + kunmap_atomic(paddr);
> } else if (*bmc <= 2) {
> *bmc = 1; /* maybe clear the bit next time */
> set_page_attr(bitmap, page, BITMAP_PAGE_PENDING);
> diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
> index 8c2a000..db6b516 100644
> --- a/drivers/md/dm-crypt.c
> +++ b/drivers/md/dm-crypt.c
> @@ -590,9 +590,9 @@ static int crypt_iv_lmk_gen(struct crypt_config *cc, u8 *iv,
> int r = 0;
>
> if (bio_data_dir(dmreq->ctx->bio_in) == WRITE) {
> - src = kmap_atomic(sg_page(&dmreq->sg_in), KM_USER0);
> + src = kmap_atomic(sg_page(&dmreq->sg_in));
> r = crypt_iv_lmk_one(cc, iv, dmreq, src + dmreq->sg_in.offset);
> - kunmap_atomic(src, KM_USER0);
> + kunmap_atomic(src);
> } else
> memset(iv, 0, cc->iv_size);
>
> @@ -608,14 +608,14 @@ static int crypt_iv_lmk_post(struct crypt_config *cc, u8 *iv,
> if (bio_data_dir(dmreq->ctx->bio_in) == WRITE)
> return 0;
>
> - dst = kmap_atomic(sg_page(&dmreq->sg_out), KM_USER0);
> + dst = kmap_atomic(sg_page(&dmreq->sg_out));
> r = crypt_iv_lmk_one(cc, iv, dmreq, dst + dmreq->sg_out.offset);
>
> /* Tweak the first block of plaintext sector */
> if (!r)
> crypto_xor(dst + dmreq->sg_out.offset, iv, cc->iv_size);
>
> - kunmap_atomic(dst, KM_USER0);
> + kunmap_atomic(dst);
> return r;
> }
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
next prev parent reply other threads:[~2011-11-27 6:00 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 [this message]
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 ` [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=20111127170013.20d180a9@notabene.brown \
--to=neilb@suse.de \
--cc=akpm@linux-foundation.org \
--cc=amwang@redhat.com \
--cc=dm-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@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®