diff options
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
-rw-r--r-- | fs/ecryptfs/ecryptfs_kernel.h | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index b73fb752c5f8..3504cf9df358 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h | |||
@@ -79,11 +79,6 @@ | |||
79 | #define ECRYPTFS_MAX_PKI_NAME_BYTES 16 | 79 | #define ECRYPTFS_MAX_PKI_NAME_BYTES 16 |
80 | #define ECRYPTFS_DEFAULT_NUM_USERS 4 | 80 | #define ECRYPTFS_DEFAULT_NUM_USERS 4 |
81 | #define ECRYPTFS_MAX_NUM_USERS 32768 | 81 | #define ECRYPTFS_MAX_NUM_USERS 32768 |
82 | #define ECRYPTFS_TRANSPORT_NETLINK 0 | ||
83 | #define ECRYPTFS_TRANSPORT_CONNECTOR 1 | ||
84 | #define ECRYPTFS_TRANSPORT_RELAYFS 2 | ||
85 | #define ECRYPTFS_TRANSPORT_MISCDEV 3 | ||
86 | #define ECRYPTFS_DEFAULT_TRANSPORT ECRYPTFS_TRANSPORT_MISCDEV | ||
87 | #define ECRYPTFS_XATTR_NAME "user.ecryptfs" | 82 | #define ECRYPTFS_XATTR_NAME "user.ecryptfs" |
88 | 83 | ||
89 | #define RFC2440_CIPHER_DES3_EDE 0x02 | 84 | #define RFC2440_CIPHER_DES3_EDE 0x02 |
@@ -400,8 +395,6 @@ struct ecryptfs_msg_ctx { | |||
400 | struct mutex mux; | 395 | struct mutex mux; |
401 | }; | 396 | }; |
402 | 397 | ||
403 | extern unsigned int ecryptfs_transport; | ||
404 | |||
405 | struct ecryptfs_daemon; | 398 | struct ecryptfs_daemon; |
406 | 399 | ||
407 | struct ecryptfs_daemon { | 400 | struct ecryptfs_daemon { |
@@ -627,31 +620,20 @@ int | |||
627 | ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value, | 620 | ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value, |
628 | size_t size, int flags); | 621 | size_t size, int flags); |
629 | int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode); | 622 | int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode); |
630 | int ecryptfs_process_helo(unsigned int transport, uid_t euid, | 623 | int ecryptfs_process_helo(uid_t euid, struct user_namespace *user_ns, |
631 | struct user_namespace *user_ns, struct pid *pid); | 624 | struct pid *pid); |
632 | int ecryptfs_process_quit(uid_t euid, struct user_namespace *user_ns, | 625 | int ecryptfs_process_quit(uid_t euid, struct user_namespace *user_ns, |
633 | struct pid *pid); | 626 | struct pid *pid); |
634 | int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid, | 627 | int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid, |
635 | struct user_namespace *user_ns, struct pid *pid, | 628 | struct user_namespace *user_ns, struct pid *pid, |
636 | u32 seq); | 629 | u32 seq); |
637 | int ecryptfs_send_message(unsigned int transport, char *data, int data_len, | 630 | int ecryptfs_send_message(char *data, int data_len, |
638 | struct ecryptfs_msg_ctx **msg_ctx); | 631 | struct ecryptfs_msg_ctx **msg_ctx); |
639 | int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx, | 632 | int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx, |
640 | struct ecryptfs_message **emsg); | 633 | struct ecryptfs_message **emsg); |
641 | int ecryptfs_init_messaging(unsigned int transport); | 634 | int ecryptfs_init_messaging(void); |
642 | void ecryptfs_release_messaging(unsigned int transport); | 635 | void ecryptfs_release_messaging(void); |
643 | 636 | ||
644 | int ecryptfs_send_netlink(char *data, int data_len, | ||
645 | struct ecryptfs_msg_ctx *msg_ctx, u8 msg_type, | ||
646 | u16 msg_flags, struct pid *daemon_pid); | ||
647 | int ecryptfs_init_netlink(void); | ||
648 | void ecryptfs_release_netlink(void); | ||
649 | |||
650 | int ecryptfs_send_connector(char *data, int data_len, | ||
651 | struct ecryptfs_msg_ctx *msg_ctx, u8 msg_type, | ||
652 | u16 msg_flags, struct pid *daemon_pid); | ||
653 | int ecryptfs_init_connector(void); | ||
654 | void ecryptfs_release_connector(void); | ||
655 | void | 637 | void |
656 | ecryptfs_write_header_metadata(char *virt, | 638 | ecryptfs_write_header_metadata(char *virt, |
657 | struct ecryptfs_crypt_stat *crypt_stat, | 639 | struct ecryptfs_crypt_stat *crypt_stat, |