diff options
author | Cong Wang <amwang@redhat.com> | 2012-02-10 00:39:50 -0500 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2012-02-16 17:06:27 -0500 |
commit | 465c9343c5b746ec2325a220fa3e50cc647d2db7 (patch) | |
tree | fbff1765ebac62a5910ba34c15deeb8729fce1be /fs | |
parent | 545d680938be1e86a6c5250701ce9abaf360c495 (diff) |
ecryptfs: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ecryptfs/mmap.c | 4 | ||||
-rw-r--r-- | 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 10ec695ccd68..a46b3a8fee1e 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c | |||
@@ -150,7 +150,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, | |||
150 | /* This is a header extent */ | 150 | /* This is a header extent */ |
151 | char *page_virt; | 151 | char *page_virt; |
152 | 152 | ||
153 | page_virt = kmap_atomic(page, KM_USER0); | 153 | page_virt = kmap_atomic(page); |
154 | memset(page_virt, 0, PAGE_CACHE_SIZE); | 154 | memset(page_virt, 0, PAGE_CACHE_SIZE); |
155 | /* TODO: Support more than one header extent */ | 155 | /* TODO: Support more than one header extent */ |
156 | if (view_extent_num == 0) { | 156 | if (view_extent_num == 0) { |
@@ -163,7 +163,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, | |||
163 | crypt_stat, | 163 | crypt_stat, |
164 | &written); | 164 | &written); |
165 | } | 165 | } |
166 | kunmap_atomic(page_virt, KM_USER0); | 166 | kunmap_atomic(page_virt); |
167 | flush_dcache_page(page); | 167 | flush_dcache_page(page); |
168 | if (rc) { | 168 | if (rc) { |
169 | printk(KERN_ERR "%s: Error reading xattr " | 169 | printk(KERN_ERR "%s: Error reading xattr " |
diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c index 5c0106f75775..b2a34a192f4f 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, | |||
156 | ecryptfs_page_idx, rc); | 156 | ecryptfs_page_idx, rc); |
157 | goto out; | 157 | goto out; |
158 | } | 158 | } |
159 | ecryptfs_page_virt = kmap_atomic(ecryptfs_page, KM_USER0); | 159 | ecryptfs_page_virt = kmap_atomic(ecryptfs_page); |
160 | 160 | ||
161 | /* | 161 | /* |
162 | * pos: where we're now writing, offset: where the request was | 162 | * 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, | |||
179 | (data + data_offset), num_bytes); | 179 | (data + data_offset), num_bytes); |
180 | data_offset += num_bytes; | 180 | data_offset += num_bytes; |
181 | } | 181 | } |
182 | kunmap_atomic(ecryptfs_page_virt, KM_USER0); | 182 | kunmap_atomic(ecryptfs_page_virt); |
183 | flush_dcache_page(ecryptfs_page); | 183 | flush_dcache_page(ecryptfs_page); |
184 | SetPageUptodate(ecryptfs_page); | 184 | SetPageUptodate(ecryptfs_page); |
185 | unlock_page(ecryptfs_page); | 185 | unlock_page(ecryptfs_page); |