diff options
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
-rw-r--r-- | fs/ecryptfs/ecryptfs_kernel.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index 01a1f8575950..0deb4f24957a 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h | |||
@@ -392,10 +392,7 @@ struct ecryptfs_daemon { | |||
392 | #define ECRYPTFS_DAEMON_MISCDEV_OPEN 0x00000008 | 392 | #define ECRYPTFS_DAEMON_MISCDEV_OPEN 0x00000008 |
393 | u32 flags; | 393 | u32 flags; |
394 | u32 num_queued_msg_ctx; | 394 | u32 num_queued_msg_ctx; |
395 | struct pid *pid; | 395 | struct file *file; |
396 | uid_t euid; | ||
397 | struct user_namespace *user_ns; | ||
398 | struct task_struct *task; | ||
399 | struct mutex mux; | 396 | struct mutex mux; |
400 | struct list_head msg_ctx_out_queue; | 397 | struct list_head msg_ctx_out_queue; |
401 | wait_queue_head_t wait; | 398 | wait_queue_head_t wait; |
@@ -619,9 +616,8 @@ int | |||
619 | ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value, | 616 | ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value, |
620 | size_t size, int flags); | 617 | size_t size, int flags); |
621 | int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode); | 618 | int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode); |
622 | int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid, | 619 | int ecryptfs_process_response(struct ecryptfs_daemon *daemon, |
623 | struct user_namespace *user_ns, struct pid *pid, | 620 | struct ecryptfs_message *msg, u32 seq); |
624 | u32 seq); | ||
625 | int ecryptfs_send_message(char *data, int data_len, | 621 | int ecryptfs_send_message(char *data, int data_len, |
626 | struct ecryptfs_msg_ctx **msg_ctx); | 622 | struct ecryptfs_msg_ctx **msg_ctx); |
627 | int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx, | 623 | int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx, |
@@ -666,8 +662,7 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs, | |||
666 | struct inode *ecryptfs_inode); | 662 | struct inode *ecryptfs_inode); |
667 | struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index); | 663 | struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index); |
668 | int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon); | 664 | int ecryptfs_exorcise_daemon(struct ecryptfs_daemon *daemon); |
669 | int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon, uid_t euid, | 665 | int ecryptfs_find_daemon_by_euid(struct ecryptfs_daemon **daemon); |
670 | struct user_namespace *user_ns); | ||
671 | int ecryptfs_parse_packet_length(unsigned char *data, size_t *size, | 666 | int ecryptfs_parse_packet_length(unsigned char *data, size_t *size, |
672 | size_t *length_size); | 667 | size_t *length_size); |
673 | int ecryptfs_write_packet_length(char *dest, size_t size, | 668 | int ecryptfs_write_packet_length(char *dest, size_t size, |
@@ -679,8 +674,7 @@ int ecryptfs_send_miscdev(char *data, size_t data_size, | |||
679 | u16 msg_flags, struct ecryptfs_daemon *daemon); | 674 | u16 msg_flags, struct ecryptfs_daemon *daemon); |
680 | void ecryptfs_msg_ctx_alloc_to_free(struct ecryptfs_msg_ctx *msg_ctx); | 675 | void ecryptfs_msg_ctx_alloc_to_free(struct ecryptfs_msg_ctx *msg_ctx); |
681 | int | 676 | int |
682 | ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, uid_t euid, | 677 | ecryptfs_spawn_daemon(struct ecryptfs_daemon **daemon, struct file *file); |
683 | struct user_namespace *user_ns, struct pid *pid); | ||
684 | int ecryptfs_init_kthread(void); | 678 | int ecryptfs_init_kthread(void); |
685 | void ecryptfs_destroy_kthread(void); | 679 | void ecryptfs_destroy_kthread(void); |
686 | int ecryptfs_privileged_open(struct file **lower_file, | 680 | int ecryptfs_privileged_open(struct file **lower_file, |