From: Tyler Hicks <tyhicks@canonical.com>
To: Cong Wang <amwang@redhat.com>
Cc: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Dustin Kirkland <dustin.kirkland@gazzang.com>,
ecryptfs@vger.kernel.org
Subject: Re: [PATCH 29/60] ecryptfs: remove the second argument of k[un]map_atomic()
Date: Fri, 10 Feb 2012 14:16:06 -0600 [thread overview]
Message-ID: <20120210201605.GC15606@boyd> (raw)
In-Reply-To: <1328852421-19678-30-git-send-email-amwang@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 2504 bytes --]
On 2012-02-10 13:39:50, Cong Wang wrote:
> Signed-off-by: Cong Wang <amwang@redhat.com>
Thanks - Looks good to me.
I'm not sure if you want me to pick this up or if you want to continue
to keep track of the entire pile of patches. Either way, I went ahead
and pushed it to
git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
Tyler
> ---
> fs/ecryptfs/mmap.c | 4 ++--
> fs/ecryptfs/read_write.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
> index 10ec695..a46b3a8 100644
> --- a/fs/ecryptfs/mmap.c
> +++ b/fs/ecryptfs/mmap.c
> @@ -150,7 +150,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,
> /* This is a header extent */
> char *page_virt;
>
> - page_virt = kmap_atomic(page, KM_USER0);
> + page_virt = kmap_atomic(page);
> memset(page_virt, 0, PAGE_CACHE_SIZE);
> /* TODO: Support more than one header extent */
> if (view_extent_num == 0) {
> @@ -163,7 +163,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,
> crypt_stat,
> &written);
> }
> - kunmap_atomic(page_virt, KM_USER0);
> + kunmap_atomic(page_virt);
> flush_dcache_page(page);
> if (rc) {
> printk(KERN_ERR "%s: Error reading xattr "
> diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
> index 5c0106f..b2a34a1 100644
> --- a/fs/ecryptfs/read_write.c
> +++ b/fs/ecryptfs/read_write.c
> @@ -156,7 +156,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
> ecryptfs_page_idx, rc);
> goto out;
> }
> - ecryptfs_page_virt = kmap_atomic(ecryptfs_page, KM_USER0);
> + ecryptfs_page_virt = kmap_atomic(ecryptfs_page);
>
> /*
> * pos: where we're now writing, offset: where the request was
> @@ -179,7 +179,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
> (data + data_offset), num_bytes);
> data_offset += num_bytes;
> }
> - kunmap_atomic(ecryptfs_page_virt, KM_USER0);
> + kunmap_atomic(ecryptfs_page_virt);
> flush_dcache_page(ecryptfs_page);
> SetPageUptodate(ecryptfs_page);
> unlock_page(ecryptfs_page);
> --
> 1.7.7.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe ecryptfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-02-10 20:16 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 5:39 [Resend PATCH 00/60] highmem: remove the second argument of k[un]map_atomic() 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 [this message]
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=20120210201605.GC15606@boyd \
--to=tyhicks@canonical.com \
--cc=akpm@linux-foundation.org \
--cc=amwang@redhat.com \
--cc=dustin.kirkland@gazzang.com \
--cc=ecryptfs@vger.kernel.org \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).