Commit 5520ebd3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
  Squashfs: simplify CONFIG_SQUASHFS_LZO handling
  Squashfs: move squashfs_i() definition from squashfs.h
  Squashfs: get rid of default n in Kconfig
  Squashfs: add missing check in zlib_wrapper
  Squashfs: remove unnecessary variable in zlib_wrapper
  Squashfs: Add XZ compression configuration option
  Squashfs: add XZ compression support
parents d3072e6a 01a678c5

fs/squashfs/Kconfig

+15 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ config SQUASHFS 
config SQUASHFS_XATTR

	bool "Squashfs XATTR support"

	depends on SQUASHFS

	default n

	help

	  Saying Y here includes support for extended attributes (xattrs).

	  Xattrs are name:value pairs associated with inodes by
@@ -40,7 +39,6 @@ config SQUASHFS_XATTR 
config SQUASHFS_LZO

	bool "Include support for LZO compressed file systems"

	depends on SQUASHFS

	default n

	select LZO_DECOMPRESS

	help

	  Saying Y here includes support for reading Squashfs file systems
@@ -53,10 +51,24 @@ config SQUASHFS_LZO 


	  If unsure, say N.



config SQUASHFS_XZ

	bool "Include support for XZ compressed file systems"

	depends on SQUASHFS

	select XZ_DEC

	help

	  Saying Y here includes support for reading Squashfs file systems

	  compressed with XZ compresssion.  XZ gives better compression than

	  the default zlib compression, at the expense of greater CPU and

	  memory overhead.



	  XZ is not the standard compression used in Squashfs and so most

	  file systems will be readable without selecting this option.



	  If unsure, say N.



config SQUASHFS_EMBEDDED

	bool "Additional option for memory-constrained systems"

	depends on SQUASHFS

	default n

	help

	  Saying Y here allows you to specify cache size.

fs/squashfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ 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_XATTR) += xattr.o xattr_id.o

squashfs-$(CONFIG_SQUASHFS_LZO) += lzo_wrapper.o

squashfs-$(CONFIG_SQUASHFS_XZ) += xz_wrapper.o

fs/squashfs/block.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 


#include "squashfs_fs.h"

#include "squashfs_fs_sb.h"

#include "squashfs_fs_i.h"

#include "squashfs.h"

#include "decompressor.h"

fs/squashfs/cache.c

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 


#include "squashfs_fs.h"

#include "squashfs_fs_sb.h"

#include "squashfs_fs_i.h"

#include "squashfs.h"



/*

fs/squashfs/decompressor.c

+9 −7
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#include "squashfs_fs.h"

#include "squashfs_fs_sb.h"

#include "squashfs_fs_i.h"

#include "decompressor.h"

#include "squashfs.h"
@@ -41,23 +40,26 @@ static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = { 
};



#ifndef CONFIG_SQUASHFS_LZO

static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {

static const struct squashfs_decompressor squashfs_lzo_comp_ops = {

	NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0

};

#endif



#ifndef CONFIG_SQUASHFS_XZ

static const struct squashfs_decompressor squashfs_xz_comp_ops = {

	NULL, NULL, NULL, XZ_COMPRESSION, "xz", 0

};

#endif



static const struct squashfs_decompressor squashfs_unknown_comp_ops = {

	NULL, NULL, NULL, 0, "unknown", 0

};



static const struct squashfs_decompressor *decompressor[] = {

	&squashfs_zlib_comp_ops,

	&squashfs_lzma_unsupported_comp_ops,

#ifdef CONFIG_SQUASHFS_LZO

	&squashfs_lzo_comp_ops,

#else

	&squashfs_lzo_unsupported_comp_ops,

#endif

	&squashfs_xz_comp_ops,

	&squashfs_lzma_unsupported_comp_ops,

	&squashfs_unknown_comp_ops

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE