aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/read_write.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ecryptfs/read_write.c')
-rw-r--r--fs/ecryptfs/read_write.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
index 0cc4fafd655..3cc17a96cf2 100644
--- a/fs/ecryptfs/read_write.c
+++ b/fs/ecryptfs/read_write.c
@@ -145,7 +145,7 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,
145 if (num_bytes > total_remaining_zeros) 145 if (num_bytes > total_remaining_zeros)
146 num_bytes = total_remaining_zeros; 146 num_bytes = total_remaining_zeros;
147 } 147 }
148 ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_file, 148 ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_inode,
149 ecryptfs_page_idx); 149 ecryptfs_page_idx);
150 if (IS_ERR(ecryptfs_page)) { 150 if (IS_ERR(ecryptfs_page)) {
151 rc = PTR_ERR(ecryptfs_page); 151 rc = PTR_ERR(ecryptfs_page);
@@ -302,10 +302,10 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,
302int ecryptfs_read(char *data, loff_t offset, size_t size, 302int ecryptfs_read(char *data, loff_t offset, size_t size,
303 struct file *ecryptfs_file) 303 struct file *ecryptfs_file)
304{ 304{
305 struct inode *ecryptfs_inode = ecryptfs_file->f_dentry->d_inode;
305 struct page *ecryptfs_page; 306 struct page *ecryptfs_page;
306 char *ecryptfs_page_virt; 307 char *ecryptfs_page_virt;
307 loff_t ecryptfs_file_size = 308 loff_t ecryptfs_file_size = i_size_read(ecryptfs_inode);
308 i_size_read(ecryptfs_file->f_dentry->d_inode);
309 loff_t data_offset = 0; 309 loff_t data_offset = 0;
310 loff_t pos; 310 loff_t pos;
311 int rc = 0; 311 int rc = 0;
@@ -327,7 +327,7 @@ int ecryptfs_read(char *data, loff_t offset, size_t size,
327 327
328 if (num_bytes > total_remaining_bytes) 328 if (num_bytes > total_remaining_bytes)
329 num_bytes = total_remaining_bytes; 329 num_bytes = total_remaining_bytes;
330 ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_file, 330 ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_inode,
331 ecryptfs_page_idx); 331 ecryptfs_page_idx);
332 if (IS_ERR(ecryptfs_page)) { 332 if (IS_ERR(ecryptfs_page)) {
333 rc = PTR_ERR(ecryptfs_page); 333 rc = PTR_ERR(ecryptfs_page);