Squashfs: Make XATTR config name consistent with other file systems

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>

diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig
index cc6ce8a84c217d50fb82aef341d26fd56da6e991..3e9ee95ef37de1baaf199f15844cf492f7cdb01c 100644 (file)
--- a/fs/squashfs/Kconfig
+++ b/fs/squashfs/Kconfig
@@ -26,7 +26,7 @@ config SQUASHFS
 
          If unsure, say N.
 
-config SQUASHFS_XATTRS
+config SQUASHFS_XATTR
        bool "Squashfs XATTR support"
        depends on SQUASHFS
        default n

diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile
index 2cee3e9fa452b81219a04145f77c1ba827723a6e..6fa6b9deecd30a111234d85b6c678831565d44bd 100644 (file)
--- a/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
@@ -5,5 +5,5 @@
 obj-$(CONFIG_SQUASHFS) += squashfs.o
 squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
 squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-squashfs-$(CONFIG_SQUASHFS_XATTRS) += xattr.o xattr_id.o
+squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o
 

diff --git a/fs/squashfs/xattr.h b/fs/squashfs/xattr.h
index 9da071ae181c0e7067a66da17abf37964c8c4ba5..49fe0d719fbfd7bf114a39a6c152d87937828957 100644 (file)
--- a/fs/squashfs/xattr.h
+++ b/fs/squashfs/xattr.h
@@ -21,7 +21,7 @@
  * xattr.h
  */
 
-#ifdef CONFIG_SQUASHFS_XATTRS
+#ifdef CONFIG_SQUASHFS_XATTR
 extern __le64 *squashfs_read_xattr_id_table(struct super_block *, u64,
                u64 *, int *);
 extern int squashfs_xattr_lookup(struct super_block *, unsigned int, int *,