4 files changed, 85 insertions, 0 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 2694648cbd1b..a52cf6280b4b 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1375,6 +1375,9 @@ config JFFS2_CMODE_FAVOURLZO
 
 endchoice
 
+# UBIFS File system configuration
+source "fs/ubifs/Kconfig"
+
 config CRAMFS
         tristate "Compressed ROM file system support (cramfs)"
         depends on BLOCK
diff --git a/fs/Makefile b/fs/Makefile
index 1e7a11bd4da1..fcae06aaadc5 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -100,6 +100,7 @@ obj-$(CONFIG_NTFS_FS)		+= ntfs/
 obj-$(CONFIG_UFS_FS)            += ufs/
 obj-$(CONFIG_EFS_FS)            += efs/
 obj-$(CONFIG_JFFS2_FS)          += jffs2/
+obj-$(CONFIG_UBIFS_FS)          += ubifs/
 obj-$(CONFIG_AFFS_FS)           += affs/
 obj-$(CONFIG_ROMFS_FS)          += romfs/
 obj-$(CONFIG_QNX4FS_FS)         += qnx4/
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
new file mode 100644
index 000000000000..91ceeda7e5bf
--- /dev/null
+++ b/fs/ubifs/Kconfig
@@ -0,0 +1,72 @@
+config UBIFS_FS
+        tristate "UBIFS file system support"
+        select CRC16
+        select CRC32
+        select CRYPTO if UBIFS_FS_ADVANCED_COMPR
+        select CRYPTO if UBIFS_FS_LZO
+        select CRYPTO if UBIFS_FS_ZLIB
+        select CRYPTO_LZO if UBIFS_FS_LZO
+        select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
+        depends on MTD_UBI
+        help
+          UBIFS is a file system for flash devices which works on top of UBI.
+
+config UBIFS_FS_XATTR
+        bool "Extended attributes support"
+        depends on UBIFS_FS
+        help
+          This option enables support of extended attributes.
+
+config UBIFS_FS_ADVANCED_COMPR
+        bool "Advanced compression options"
+        depends on UBIFS_FS
+        help
+          This option allows to explicitly choose which compressions, if any,
+          are enabled in UBIFS. Removing compressors means inbility to read
+          existing file systems.
+
+          If unsure, say 'N'.
+
+config UBIFS_FS_LZO
+        bool "LZO compression support" if UBIFS_FS_ADVANCED_COMPR
+        depends on UBIFS_FS
+        default y
+        help
+           LZO compressor is generally faster then zlib but compresses worse.
+           Say 'Y' if unsure.
+
+config UBIFS_FS_ZLIB
+        bool "ZLIB compression support" if UBIFS_FS_ADVANCED_COMPR
+        depends on UBIFS_FS
+        default y
+        help
+          Zlib copresses better then LZO but it is slower. Say 'Y' if unsure.
+
+# Debugging-related stuff
+config UBIFS_FS_DEBUG
+        bool "Enable debugging"
+        depends on UBIFS_FS
+        select DEBUG_FS
+        select KALLSYMS_ALL
+        help
+          This option enables UBIFS debugging.
+
+config UBIFS_FS_DEBUG_MSG_LVL
+        int "Default message level (0 = no extra messages, 3 = lots)"
+        depends on UBIFS_FS_DEBUG
+        default "0"
+        help
+          This controls the amount of debugging messages produced by UBIFS.
+          If reporting bugs, please try to have available a full dump of the
+          messages at level 1 while the misbehaviour was occurring. Level 2
+          may become necessary if level 1 messages were not enough to find the
+          bug. Generally Level 3 should be avoided.
+
+config UBIFS_FS_DEBUG_CHKS
+        bool "Enable extra checks"
+        depends on UBIFS_FS_DEBUG
+        help
+          If extra checks are enabled UBIFS will check the consistency of its
+          internal data structures during operation. However, UBIFS performance
+          is dramatically slower when this option is selected especially if the
+          file system is large.
diff --git a/fs/ubifs/Makefile b/fs/ubifs/Makefile
new file mode 100644
index 000000000000..80e93c35e496
--- /dev/null
+++ b/fs/ubifs/Makefile
@@ -0,0 +1,9 @@
+obj-$(CONFIG_UBIFS_FS) += ubifs.o
+
+ubifs-y += shrinker.o journal.o file.o dir.o super.o sb.o io.o
+ubifs-y += tnc.o master.o scan.o replay.o log.o commit.o gc.o orphan.o
+ubifs-y += budget.o find.o tnc_commit.o compress.o lpt.o lprops.o
+ubifs-y += recovery.o ioctl.o lpt_commit.o tnc_misc.o
+
+ubifs-$(CONFIG_UBIFS_FS_DEBUG) += debug.o
+ubifs-$(CONFIG_UBIFS_FS_XATTR) += xattr.o