iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch ecryptfs_get_locked_page() to struct inode *

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2010-05-21 11:02:14 -04:00
parent bef5bc2464
commit 02bd97997a
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ecryptfs/ecryptfs_kernel.h
View File

@ -739,7 +739,7 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,
pgoff_t page_index, pgoff_t page_index,
size_t offset_in_page, size_t size, size_t offset_in_page, size_t size,
struct inode *ecryptfs_inode); struct inode *ecryptfs_inode);
struct page *ecryptfs_get_locked_page(struct file *file, loff_t index); struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index);
int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon); int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon);
int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon, uid_t euid, int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon, uid_t euid,
struct user_namespace *user_ns); struct user_namespace *user_ns);

12
fs/ecryptfs/mmap.c
View File

@ -44,17 +44,9 @@
* Returns locked and up-to-date page (if ok), with increased * Returns locked and up-to-date page (if ok), with increased
* refcnt. * refcnt.
*/ */
struct page *ecryptfs_get_locked_page(struct file *file, loff_t index) struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index)
{ {
struct dentry *dentry; struct page *page = read_mapping_page(inode->i_mapping, index, NULL);
struct inode *inode;
struct address_space *mapping;
struct page *page;
dentry = file->f_path.dentry;
inode = dentry->d_inode;
mapping = inode->i_mapping;
page = read_mapping_page(mapping, index, (void *)file);
if (!IS_ERR(page)) if (!IS_ERR(page))
lock_page(page); lock_page(page);
return page; return page;

8
fs/ecryptfs/read_write.c
View File

@ -145,7 +145,7 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,
if (num_bytes > total_remaining_zeros) if (num_bytes > total_remaining_zeros)
num_bytes = total_remaining_zeros; num_bytes = total_remaining_zeros;
} }
ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_file, ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_inode,
ecryptfs_page_idx); ecryptfs_page_idx);
if (IS_ERR(ecryptfs_page)) { if (IS_ERR(ecryptfs_page)) {
rc = PTR_ERR(ecryptfs_page); rc = PTR_ERR(ecryptfs_page);
@ -302,10 +302,10 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,
int ecryptfs_read(char *data, loff_t offset, size_t size, int ecryptfs_read(char *data, loff_t offset, size_t size,
struct file *ecryptfs_file) struct file *ecryptfs_file)
{ {
struct inode *ecryptfs_inode = ecryptfs_file->f_dentry->d_inode;
struct page *ecryptfs_page; struct page *ecryptfs_page;
char *ecryptfs_page_virt; char *ecryptfs_page_virt;
loff_t ecryptfs_file_size = loff_t ecryptfs_file_size = i_size_read(ecryptfs_inode);
i_size_read(ecryptfs_file->f_dentry->d_inode);
loff_t data_offset = 0; loff_t data_offset = 0;
loff_t pos; loff_t pos;
int rc = 0; int rc = 0;
@ -327,7 +327,7 @@ int ecryptfs_read(char *data, loff_t offset, size_t size,
if (num_bytes > total_remaining_bytes) if (num_bytes > total_remaining_bytes)
num_bytes = total_remaining_bytes; num_bytes = total_remaining_bytes;
ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_file, ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_inode,
ecryptfs_page_idx); ecryptfs_page_idx);
if (IS_ERR(ecryptfs_page)) { if (IS_ERR(ecryptfs_page)) {
rc = PTR_ERR(ecryptfs_page); rc = PTR_ERR(ecryptfs_page);