Re: [PATCH 29/60] ecryptfs: remove the second argument of k[un]map_atomic()

[Tyler Hicks <tyhicks@canonical.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 --]