From: Phillip Lougher Subject: [PATCH 2/7] Squashfs: Make XATTR config name consistent with other file systems Date: Fri, 06 Aug 2010 01:25:33 +0100 Message-ID: <4C5B567D.4010508@lougher.demon.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit To: linux-fsdevel@vger.kernel.org Return-path: Received: from anchor-post-1.mail.demon.net ([195.173.77.132]:49860 "EHLO anchor-post-1.mail.demon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756530Ab0HFA1N (ORCPT ); Thu, 5 Aug 2010 20:27:13 -0400 Received: from lougher.demon.co.uk ([80.177.127.218] helo=[10.0.1.3]) by anchor-post-1.mail.demon.net with esmtp (Exim 4.69) id 1OhAmG-0006Fd-iP for linux-fsdevel@vger.kernel.org; Fri, 06 Aug 2010 00:27:12 +0000 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: 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 cc6ce8a..3e9ee95 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 2cee3e9..6fa6b9d 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 9da071a..49fe0d7 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 *, -- 1.6.3.3