From e7287ce11197d5e2eedfc4e866e95ef812efb526 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sat, 7 Aug 2010 09:28:47 +0200 Subject: squashfs3: use 'squashfs3' for the module and config options --- fs/Kconfig | 12 ++++++------ fs/Makefile | 2 +- fs/squashfs3/Makefile | 6 +++--- include/linux/squashfs_fs.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index 48312db..28e5486 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1348,7 +1348,7 @@ config CRAMFS If unsure, say N. -config SQUASHFS +config SQUASHFS3 tristate "SquashFS 3.4 - Squashed file system support" select ZLIB_INFLATE help @@ -1374,19 +1374,19 @@ config SQUASHFS If unsure, say N. -config SQUASHFS_EMBEDDED +config SQUASHFS3_EMBEDDED bool "Additional option for memory-constrained systems" - depends on SQUASHFS + depends on SQUASHFS3 default n help Saying Y here allows you to specify cache size. If unsure, say N. -config SQUASHFS_FRAGMENT_CACHE_SIZE - int "Number of fragments cached" if SQUASHFS_EMBEDDED - depends on SQUASHFS +config SQUASHFS3_FRAGMENT_CACHE_SIZE + int "Number of fragments cached" if SQUASHFS3_EMBEDDED + depends on SQUASHFS3 default "3" help By default SquashFS caches the last 3 fragments read from diff --git a/fs/Makefile b/fs/Makefile index 290dc6f..fdbfdce 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -74,7 +74,7 @@ obj-$(CONFIG_JBD) += jbd/ obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ -obj-$(CONFIG_SQUASHFS) += squashfs3/ +obj-$(CONFIG_SQUASHFS3) += squashfs3/ obj-y += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ diff --git a/fs/squashfs3/Makefile b/fs/squashfs3/Makefile index 1bc7b06..04345f8 100644 --- a/fs/squashfs3/Makefile +++ b/fs/squashfs3/Makefile @@ -2,6 +2,6 @@ # Makefile for the linux squashfs routines. # -obj-$(CONFIG_SQUASHFS) += squashfs.o -squashfs-y += inode.o -squashfs-y += squashfs2_0.o +obj-$(CONFIG_SQUASHFS3) += squashfs3.o +squashfs3-y += inode.o +squashfs3-y += squashfs2_0.o diff --git a/include/linux/squashfs_fs.h b/include/linux/squashfs_fs.h index 4cdd11f..571126a 100644 --- a/include/linux/squashfs_fs.h +++ b/include/linux/squashfs_fs.h @@ -28,7 +28,7 @@ #define CONFIG_SQUASHFS_2_0_COMPATIBILITY #endif -#define SQUASHFS_CACHED_FRAGMENTS CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE +#define SQUASHFS_CACHED_FRAGMENTS CONFIG_SQUASHFS3_FRAGMENT_CACHE_SIZE #define SQUASHFS_MAJOR 3 #define SQUASHFS_MINOR 1 #define SQUASHFS_MAGIC 0x73717368 -- 1.6.4.4