From 637d5c9a36bcb2b101401d52191ff3c7580f9068 Mon Sep 17 00:00:00 2001 From: Phillip Lougher Date: Mon, 31 May 2010 18:46:29 +0100 Subject: [PATCH] Squashfs: Make XATTR config name consistent with other file systems Reported-by: Geert Uytterhoeven Signed-off-by: Phillip Lougher --- fs/squashfs/Kconfig | 2 +- fs/squashfs/Makefile | 2 +- fs/squashfs/xattr.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig index cc6ce8a84c21..3e9ee95ef37d 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 2cee3e9fa452..6fa6b9deecd3 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 9da071ae181c..49fe0d719fbf 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 *, -- 2.39.5