diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 12:49:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 12:49:56 +0100 |
| commit | 9ee4be4156b1a507f199e750ba2c13ffb6ea9b42 (patch) | |
| tree | c92cb39ad1f0be559390c2a995d9aad2b0300b14 /fs/ecryptfs/ecryptfs_kernel.h | |
| parent | regulator: Convert virtual and userspace regulator consumer drivers to use mo... (diff) | |
| parent | regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_... (diff) | |
| download | linux-9ee4be4156b1a507f199e750ba2c13ffb6ea9b42.tar.xz linux-9ee4be4156b1a507f199e750ba2c13ffb6ea9b42.zip | |
Merge remote-tracking branch 'regulator/for-linus' into regulator-next
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
| -rw-r--r-- | fs/ecryptfs/ecryptfs_kernel.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index 54481a3b2c79..a9f29b12fbf2 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h @@ -584,9 +584,10 @@ int ecryptfs_init_crypt_ctx(struct ecryptfs_crypt_stat *crypt_stat); int ecryptfs_write_inode_size_to_metadata(struct inode *ecryptfs_inode); int ecryptfs_encrypt_page(struct page *page); int ecryptfs_decrypt_page(struct page *page); -int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry); +int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry, + struct inode *ecryptfs_inode); int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry); -int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry); +int ecryptfs_new_file_context(struct inode *ecryptfs_inode); void ecryptfs_write_crypt_stat_flags(char *page_virt, struct ecryptfs_crypt_stat *crypt_stat, size_t *written); |