diff options
author | Michael Halcrow <mhalcrow@us.ibm.com> | 2008-07-24 00:30:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:31 -0400 |
commit | 72b55fffd631a89e5be6fe1b4f2565bc4cd90deb (patch) | |
tree | ece810c24655a6eeed96a6f2fbe14dea6478f031 /fs/ecryptfs/ecryptfs_kernel.h | |
parent | 0a688ad713949643e201431d3f4a4ceddfeb70ca (diff) |
eCryptfs: do not try to open device files on mknod
When creating device nodes, eCryptfs needs to delay actually opening the lower
persistent file until an application tries to open. Device handles may not be
backed by anything when they first come into existence.
[Valdis.Kletnieks@vt.edu: build fix]
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: <Valdis.Kletnieks@vt.edu}
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
-rw-r--r-- | fs/ecryptfs/ecryptfs_kernel.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index b4a0cccfdd7c..b0727f91454e 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h | |||
@@ -235,6 +235,7 @@ struct ecryptfs_crypt_stat { | |||
235 | #define ECRYPTFS_METADATA_IN_XATTR 0x00000100 | 235 | #define ECRYPTFS_METADATA_IN_XATTR 0x00000100 |
236 | #define ECRYPTFS_VIEW_AS_ENCRYPTED 0x00000200 | 236 | #define ECRYPTFS_VIEW_AS_ENCRYPTED 0x00000200 |
237 | #define ECRYPTFS_KEY_SET 0x00000400 | 237 | #define ECRYPTFS_KEY_SET 0x00000400 |
238 | #define ECRYPTFS_DELAY_PERSISTENT 0x00000800 | ||
238 | u32 flags; | 239 | u32 flags; |
239 | unsigned int file_version; | 240 | unsigned int file_version; |
240 | size_t iv_bytes; | 241 | size_t iv_bytes; |
@@ -574,9 +575,11 @@ struct ecryptfs_open_req { | |||
574 | struct list_head kthread_ctl_list; | 575 | struct list_head kthread_ctl_list; |
575 | }; | 576 | }; |
576 | 577 | ||
578 | #define ECRYPTFS_INTERPOSE_FLAG_D_ADD 0x00000001 | ||
579 | #define ECRYPTFS_INTERPOSE_FLAG_DELAY_PERSISTENT_FILE 0x00000002 | ||
577 | int ecryptfs_interpose(struct dentry *hidden_dentry, | 580 | int ecryptfs_interpose(struct dentry *hidden_dentry, |
578 | struct dentry *this_dentry, struct super_block *sb, | 581 | struct dentry *this_dentry, struct super_block *sb, |
579 | int flag); | 582 | u32 flags); |
580 | int ecryptfs_fill_zeros(struct file *file, loff_t new_length); | 583 | int ecryptfs_fill_zeros(struct file *file, loff_t new_length); |
581 | int ecryptfs_decode_filename(struct ecryptfs_crypt_stat *crypt_stat, | 584 | int ecryptfs_decode_filename(struct ecryptfs_crypt_stat *crypt_stat, |
582 | const char *name, int length, | 585 | const char *name, int length, |
@@ -709,5 +712,6 @@ void ecryptfs_destroy_kthread(void); | |||
709 | int ecryptfs_privileged_open(struct file **lower_file, | 712 | int ecryptfs_privileged_open(struct file **lower_file, |
710 | struct dentry *lower_dentry, | 713 | struct dentry *lower_dentry, |
711 | struct vfsmount *lower_mnt); | 714 | struct vfsmount *lower_mnt); |
715 | int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry); | ||
712 | 716 | ||
713 | #endif /* #ifndef ECRYPTFS_KERNEL_H */ | 717 | #endif /* #ifndef ECRYPTFS_KERNEL_H */ |