diff options
| author | Michael Halcrow | 2008-04-29 09:59:51 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-29 17:06:07 +0200 |
| commit | f66e883eb6186bc43a79581b67aff7d1a69d0ff1 (patch) | |
| tree | 9fc1fb65586ff334a1f8c1afb9a43edf077d338f /fs/ecryptfs/netlink.c | |
| parent | eCryptfs: introduce device handle for userspace daemon communications (diff) | |
| download | kernel-qcow2-linux-f66e883eb6186bc43a79581b67aff7d1a69d0ff1.tar.gz kernel-qcow2-linux-f66e883eb6186bc43a79581b67aff7d1a69d0ff1.tar.xz kernel-qcow2-linux-f66e883eb6186bc43a79581b67aff7d1a69d0ff1.zip | |
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.c | 8 |
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; * upon sending the message; non-zero upon error. */ int ecryptfs_send_netlink(char *data, int data_len, - struct ecryptfs_msg_ctx *msg_ctx, u16 msg_type, + struct ecryptfs_msg_ctx *msg_ctx, u8 msg_type, u16 msg_flags, pid_t daemon_pid) { struct sk_buff *skb; @@ -176,20 +176,20 @@ static void ecryptfs_receive_nl_message(struct sk_buff *skb) goto free; } switch (nlh->nlmsg_type) { - case ECRYPTFS_NLMSG_RESPONSE: + case ECRYPTFS_MSG_RESPONSE: if (ecryptfs_process_nl_response(skb)) { ecryptfs_printk(KERN_WARNING, "Failed to " "deliver netlink response to " "requesting operation\n"); } break; - case ECRYPTFS_NLMSG_HELO: + case ECRYPTFS_MSG_HELO: if (ecryptfs_process_nl_helo(skb)) { ecryptfs_printk(KERN_WARNING, "Failed to " "fulfill HELO request\n"); } break; - case ECRYPTFS_NLMSG_QUIT: + case ECRYPTFS_MSG_QUIT: if (ecryptfs_process_nl_quit(skb)) { ecryptfs_printk(KERN_WARNING, "Failed to " "fulfill QUIT request\n"); |