From 61cf45d0199041df1a8ba334b6bf4a3a13b7f904 Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Wed, 14 Sep 2011 15:06:00 -0400
Subject: [PATCH] encrypted-keys: create encrypted-keys directory

Move all files associated with encrypted keys to keys/encrypted-keys.

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---
 security/keys/Makefile                               | 2 +-
 security/keys/encrypted-keys/Makefile                | 5 +++++
 security/keys/{ => encrypted-keys}/ecryptfs_format.c | 0
 security/keys/{ => encrypted-keys}/ecryptfs_format.h | 0
 security/keys/{ => encrypted-keys}/encrypted.c       | 0
 security/keys/{ => encrypted-keys}/encrypted.h       | 0
 6 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 security/keys/encrypted-keys/Makefile
 rename security/keys/{ => encrypted-keys}/ecryptfs_format.c (100%)
 rename security/keys/{ => encrypted-keys}/ecryptfs_format.h (100%)
 rename security/keys/{ => encrypted-keys}/encrypted.c (100%)
 rename security/keys/{ => encrypted-keys}/encrypted.h (100%)

diff --git a/security/keys/Makefile b/security/keys/Makefile
index b34cc6ee6900..a56f1ffdc64d 100644
--- a/security/keys/Makefile
+++ b/security/keys/Makefile
@@ -14,7 +14,7 @@ obj-y := \
 	user_defined.o
 
 obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
-obj-$(CONFIG_ENCRYPTED_KEYS) += ecryptfs_format.o encrypted.o
+obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys/
 obj-$(CONFIG_KEYS_COMPAT) += compat.o
 obj-$(CONFIG_PROC_FS) += proc.o
 obj-$(CONFIG_SYSCTL) += sysctl.o
diff --git a/security/keys/encrypted-keys/Makefile b/security/keys/encrypted-keys/Makefile
new file mode 100644
index 000000000000..cbd3f8de37bb
--- /dev/null
+++ b/security/keys/encrypted-keys/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for encrypted keys
+#
+
+obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o
diff --git a/security/keys/ecryptfs_format.c b/security/keys/encrypted-keys/ecryptfs_format.c
similarity index 100%
rename from security/keys/ecryptfs_format.c
rename to security/keys/encrypted-keys/ecryptfs_format.c
diff --git a/security/keys/ecryptfs_format.h b/security/keys/encrypted-keys/ecryptfs_format.h
similarity index 100%
rename from security/keys/ecryptfs_format.h
rename to security/keys/encrypted-keys/ecryptfs_format.h
diff --git a/security/keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
similarity index 100%
rename from security/keys/encrypted.c
rename to security/keys/encrypted-keys/encrypted.c
diff --git a/security/keys/encrypted.h b/security/keys/encrypted-keys/encrypted.h
similarity index 100%
rename from security/keys/encrypted.h
rename to security/keys/encrypted-keys/encrypted.h