fscrypto: no support for v3.4
Encryption is now disabled.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
diff --git a/fs/Kconfig b/fs/Kconfig
index 095c4ca..00b0dcb 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -62,8 +62,6 @@
for filesystems like NFS and for the flock() system
call. Disabling this option saves about 11k.
-source "fs/crypto/Kconfig"
-
source "fs/notify/Kconfig"
source "fs/quota/Kconfig"
diff --git a/fs/crypto/Makefile b/fs/crypto/Makefile
index f17684c..fec9afe 100644
--- a/fs/crypto/Makefile
+++ b/fs/crypto/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_FS_ENCRYPTION) += fscrypto.o
+obj-$(CONFIG_FS_ENCRYPTION) += # fscrypto.o
-fscrypto-y := crypto.o fname.o policy.o keyinfo.o
+fscrypto-y := # crypto.o fname.o policy.o keyinfo.o
diff --git a/fs/f2fs/Kconfig b/fs/f2fs/Kconfig
index 3dbc4d1..7ffabc9 100644
--- a/fs/f2fs/Kconfig
+++ b/fs/f2fs/Kconfig
@@ -72,17 +72,6 @@
If you want to improve the performance, say N.
-config F2FS_FS_ENCRYPTION
- bool "F2FS Encryption"
- depends on F2FS_FS
- depends on F2FS_FS_XATTR
- select FS_ENCRYPTION
- help
- Enable encryption of f2fs files and directories. This
- feature is similar to ecryptfs, but it is more memory
- efficient since it avoids caching the encrypted and
- decrypted pages in the page cache.
-
config F2FS_IO_TRACE
bool "F2FS IO tracer"
depends on F2FS_FS
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index a48c200..6ef8c89 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -11,6 +11,10 @@
#ifndef _LINUX_F2FS_H
#define _LINUX_F2FS_H
+#ifdef CONFIG_F2FS_FS_ENCRYPTION
+#undef CONFIG_F2FS_FS_ENCRYPTION
+#endif
+
#include <linux/types.h>
#include <linux/page-flags.h>
#include <linux/buffer_head.h>
diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index 71a9ba8..1a1d318 100644
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -11,6 +11,10 @@
#ifndef _LINUX_F2FS_FS_H
#define _LINUX_F2FS_FS_H
+#ifdef CONFIG_F2FS_FS_ENCRYPTION
+#undef CONFIG_F2FS_FS_ENCRYPTION
+#endif
+
#include <linux/pagemap.h>
#include <linux/types.h>
