aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/netlink.c
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2008-04-29 03:59:51 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:07 -0400
commitf66e883eb6186bc43a79581b67aff7d1a69d0ff1 (patch)
tree9fc1fb65586ff334a1f8c1afb9a43edf077d338f /fs/ecryptfs/netlink.c
parent8bf2debd5f7bf12d122124e34fec14af5b1e8ecf (diff)
eCryptfs: integrate eCryptfs device handle into the module.
Update the versioning information. Make the message types generic. Add an outgoing message queue to the daemon struct. Make the functions to parse and write the packet lengths available to the rest of the module. Add functions to create and destroy the daemon structs. Clean up some of the comments and make the code a little more consistent with itself. [akpm@linux-foundation.org: printk fixes] Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/netlink.c')
-rw-r--r--fs/ecryptfs/netlink.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ecryptfs/netlink.c b/fs/ecryptfs/netlink.c
index f638a698dc52..eb70f69d705d 100644
--- a/fs/ecryptfs/netlink.c
+++ b/fs/ecryptfs/netlink.c
@@ -44,7 +44,7 @@ static struct sock *ecryptfs_nl_sock;
44 * upon sending the message; non-zero upon error. 44 * upon sending the message; non-zero upon error.
45 */ 45 */
46int ecryptfs_send_netlink(char *data, int data_len, 46int ecryptfs_send_netlink(char *data, int data_len,
47 struct ecryptfs_msg_ctx *msg_ctx, u16 msg_type, 47 struct ecryptfs_msg_ctx *msg_ctx, u8 msg_type,
48 u16 msg_flags, pid_t daemon_pid) 48 u16 msg_flags, pid_t daemon_pid)
49{ 49{
50 struct sk_buff *skb; 50 struct sk_buff *skb;
@@ -176,20 +176,20 @@ static void ecryptfs_receive_nl_message(struct sk_buff *skb)
176 goto free; 176 goto free;
177 } 177 }
178 switch (nlh->nlmsg_type) { 178 switch (nlh->nlmsg_type) {
179 case ECRYPTFS_NLMSG_RESPONSE: 179 case ECRYPTFS_MSG_RESPONSE:
180 if (ecryptfs_process_nl_response(skb)) { 180 if (ecryptfs_process_nl_response(skb)) {
181 ecryptfs_printk(KERN_WARNING, "Failed to " 181 ecryptfs_printk(KERN_WARNING, "Failed to "
182 "deliver netlink response to " 182 "deliver netlink response to "
183 "requesting operation\n"); 183 "requesting operation\n");
184 } 184 }
185 break; 185 break;
186 case ECRYPTFS_NLMSG_HELO: 186 case ECRYPTFS_MSG_HELO:
187 if (ecryptfs_process_nl_helo(skb)) { 187 if (ecryptfs_process_nl_helo(skb)) {
188 ecryptfs_printk(KERN_WARNING, "Failed to " 188 ecryptfs_printk(KERN_WARNING, "Failed to "
189 "fulfill HELO request\n"); 189 "fulfill HELO request\n");
190 } 190 }
191 break; 191 break;
192 case ECRYPTFS_NLMSG_QUIT: 192 case ECRYPTFS_MSG_QUIT:
193 if (ecryptfs_process_nl_quit(skb)) { 193 if (ecryptfs_process_nl_quit(skb)) {
194 ecryptfs_printk(KERN_WARNING, "Failed to " 194 ecryptfs_printk(KERN_WARNING, "Failed to "
195 "fulfill QUIT request\n"); 195 "fulfill QUIT request\n");