Skip to contentSkip to conversation

Squashfs updates for 2.6.38

GIT PULL Phillip Lougher 1 participant 1 message Jan 16, 2011

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please consider pulling the following Squashfs update which adds support for XZ compressed file systems. In addition to that there's some minor code improvements/tidying and the addition of a missing error check to the zlib decompression wrapper code.

Thanks

Phillip

-------------------------

The following changes since commit 581548db3b3c0f6e25b500329eb02e3c72e7acbe:
Linus Torvalds (1):

        Merge branch 'release' of git://git.kernel.org/.../aegl/linux-2.6

are available in the git repository at:

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

Phillip Lougher (7):
Squashfs: add XZ compression support
Squashfs: Add XZ compression configuration option
Squashfs: remove unnecessary variable in zlib_wrapper
Squashfs: add missing check in zlib_wrapper
Squashfs: get rid of default n in Kconfig
Squashfs: move squashfs_i() definition from squashfs.h
Squashfs: simplify CONFIG_SQUASHFS_LZO handling

 fs/squashfs/Kconfig         |   18 ++++-
 fs/squashfs/Makefile        |    1 +
 fs/squashfs/block.c         |    1 -
 fs/squashfs/cache.c         |    1 -
 fs/squashfs/decompressor.c  |   16 +++--
 fs/squashfs/decompressor.h  |    9 +++
 fs/squashfs/fragment.c      |    1 -
 fs/squashfs/id.c            |    1 -
 fs/squashfs/lzo_wrapper.c   |    1 -
 fs/squashfs/squashfs.h      |    8 --
 fs/squashfs/squashfs_fs.h   |    1 +
 fs/squashfs/squashfs_fs_i.h |    6 ++
 fs/squashfs/xattr_id.c      |    1 -
 fs/squashfs/xz_wrapper.c    |  153 +++++++++++++++++++++++++++++++++++++++++++
 fs/squashfs/zlib_wrapper.c  |   15 +++--
 15 files changed, 203 insertions(+), 30 deletions(-)
 create mode 100644 fs/squashfs/xz_wrapper.c