summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/read_write.c
diff options
context:
space:
mode:
authorAl Viro2010-05-21 17:09:58 +0200
committerAl Viro2010-05-22 00:31:28 +0200
commit48c1e44aceca577aa35be509714bd9ec4b4c3837 (patch)
tree5fe7c1f352e21bf1d58763cb2f4158d94e080923 /fs/ecryptfs/read_write.c
parentswitch ecryptfs_get_locked_page() to struct inode * (diff)
downloadkernel-qcow2-linux-48c1e44aceca577aa35be509714bd9ec4b4c3837.tar.gz
kernel-qcow2-linux-48c1e44aceca577aa35be509714bd9ec4b4c3837.tar.xz
kernel-qcow2-linux-48c1e44aceca577aa35be509714bd9ec4b4c3837.zip
switch ecryptfs_write() to struct inode *, kill on-stack fake files
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ecryptfs/read_write.c')
-rw-r--r--fs/ecryptfs/read_write.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
index 3cc17a96cf24..db184ef15d3d 100644
--- a/fs/ecryptfs/read_write.c
+++ b/fs/ecryptfs/read_write.c
@@ -93,7 +93,7 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,
/**
* ecryptfs_write
- * @ecryptfs_file: The eCryptfs file into which to write
+ * @ecryptfs_inode: The eCryptfs file into which to write
* @data: Virtual address where data to write is located
* @offset: Offset in the eCryptfs file at which to begin writing the
* data from @data
@@ -109,12 +109,11 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,
*
* Returns zero on success; non-zero otherwise
*/
-int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,
+int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
size_t size)
{
struct page *ecryptfs_page;
struct ecryptfs_crypt_stat *crypt_stat;
- struct inode *ecryptfs_inode = ecryptfs_file->f_dentry->d_inode;
char *ecryptfs_page_virt;
loff_t ecryptfs_file_size = i_size_read(ecryptfs_inode);
loff_t data_offset = 0;