aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@canonical.com>2012-06-11 12:39:54 -0400
committerTyler Hicks <tyhicks@canonical.com>2012-07-08 13:51:43 -0400
commit566968866555a19d0a78e0bfa845cd249a7eeae2 (patch)
treec6f7b2713ba055d564105bab4fb996ab2dfe889f
parent069ddcda37b2cf5bb4b6031a944c0e9359213262 (diff)
eCryptfs: Remove unused messaging declarations and function
These are no longer needed. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Cc: Sasha Levin <levinsasha928@gmail.com>
-rw-r--r--fs/ecryptfs/ecryptfs_kernel.h6
-rw-r--r--fs/ecryptfs/messaging.c31
2 files changed, 0 insertions, 37 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 867b64c5d84f..01a1f8575950 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -385,8 +385,6 @@ struct ecryptfs_msg_ctx {
385 struct mutex mux; 385 struct mutex mux;
386}; 386};
387 387
388struct ecryptfs_daemon;
389
390struct ecryptfs_daemon { 388struct ecryptfs_daemon {
391#define ECRYPTFS_DAEMON_IN_READ 0x00000001 389#define ECRYPTFS_DAEMON_IN_READ 0x00000001
392#define ECRYPTFS_DAEMON_IN_POLL 0x00000002 390#define ECRYPTFS_DAEMON_IN_POLL 0x00000002
@@ -621,10 +619,6 @@ int
621ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value, 619ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
622 size_t size, int flags); 620 size_t size, int flags);
623int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode); 621int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode);
624int ecryptfs_process_helo(uid_t euid, struct user_namespace *user_ns,
625 struct pid *pid);
626int ecryptfs_process_quit(uid_t euid, struct user_namespace *user_ns,
627 struct pid *pid);
628int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid, 622int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t euid,
629 struct user_namespace *user_ns, struct pid *pid, 623 struct user_namespace *user_ns, struct pid *pid,
630 u32 seq); 624 u32 seq);
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index a750f957b145..c11911decdc1 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -216,37 +216,6 @@ out:
216} 216}
217 217
218/** 218/**
219 * ecryptfs_process_quit
220 * @euid: The user ID owner of the message
221 * @user_ns: The namespace in which @euid applies
222 * @pid: The process ID for the userspace program that sent the
223 * message
224 *
225 * Deletes the corresponding daemon for the given euid and pid, if
226 * it is the registered that is requesting the deletion. Returns zero
227 * after deleting the desired daemon; non-zero otherwise.
228 */
229int ecryptfs_process_quit(uid_t euid, struct user_namespace *user_ns,
230 struct pid *pid)
231{
232 struct ecryptfs_daemon *daemon;
233 int rc;
234
235 mutex_lock(&ecryptfs_daemon_hash_mux);
236 rc = ecryptfs_find_daemon_by_euid(&daemon, euid, user_ns);
237 if (rc || !daemon) {
238 rc = -EINVAL;
239 printk(KERN_ERR "Received request from user [%d] to "
240 "unregister unrecognized daemon [0x%p]\n", euid, pid);
241 goto out_unlock;
242 }
243 rc = ecryptfs_exorcise_daemon(daemon);
244out_unlock:
245 mutex_unlock(&ecryptfs_daemon_hash_mux);
246 return rc;
247}
248
249/**
250 * ecryptfs_process_reponse 219 * ecryptfs_process_reponse
251 * @msg: The ecryptfs message received; the caller should sanity check 220 * @msg: The ecryptfs message received; the caller should sanity check
252 * msg->data_len and free the memory 221 * msg->data_len and free the memory