From: Phillip Lougher Date: Mon, 31 May 2010 17:46:29 +0000 (+0100) Subject: Squashfs: Make XATTR config name consistent with other file systems X-Git-Tag: v2.6.36-rc1~97^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=637d5c9a36bcb2b101401d52191ff3c7580f9068;p=thirdparty%2Fkernel%2Flinux.git Squashfs: Make XATTR config name consistent with other file systems Reported-by: Geert Uytterhoeven Signed-off-by: Phillip Lougher --- diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig index cc6ce8a84c217..3e9ee95ef37de 100644 --- 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 2cee3e9fa452b..6fa6b9deecd30 100644 --- 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 9da071ae181c0..49fe0d719fbfd 100644 --- 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 *,