Skip to contentSkip to conversation

Squashfs updates for 2.6.34-rc1

GIT PULL Phillip Lougher 3 participants 4 messages Mar 5, 2010 – Mar 11, 2010 VFS

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please consider pulling the following revised Squashfs update for 2.6.34-rc1. I have removed all the lzma/bunzip2/inflate/lzo code changes (which as far as I know were the blocking issue previously).

What remains in the pull request is a clean-up/refactoring of the zlib wrapper code, outline knowledge of lzma/lzo compressed filesystems (unsupported, but it gives users an understandable error message when they try to mount them), and some trivial code tidying.

Please pull.

Thanks

Phillip

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

The following changes since commit 7284ce6c9f6153d1777df5f310c959724d1bd446:
Linus Torvalds (1):

        Linux 2.6.33-rc4

are available in the git repository at:

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

Phillip Lougher (6):
Squashfs: move zlib decompression wrapper code into a separate file
Squashfs: factor out remaining zlib dependencies into separate wrapper file
Squashfs: add a decompressor framework
Squashfs: add decompressor entries for lzma and lzo
Squashfs: get rid of obsolete variable in struct squashfs_sb_info
Squashfs: get rid of obsolete definition in header file

 fs/squashfs/Makefile         |    2 +-
 fs/squashfs/block.c          |   76 ++--------------------
 fs/squashfs/cache.c          |    1 -
 fs/squashfs/decompressor.c   |   68 +++++++++++++++++++
 fs/squashfs/decompressor.h   |   55 +++++++++++++++
 fs/squashfs/dir.c            |    1 -
 fs/squashfs/export.c         |    1 -
 fs/squashfs/file.c           |    1 -
 fs/squashfs/fragment.c       |    1 -
 fs/squashfs/id.c             |    1 -
 fs/squashfs/inode.c          |    1 -
 fs/squashfs/namei.c          |    1 -
 fs/squashfs/squashfs.h       |    8 ++-
 fs/squashfs/squashfs_fs.h    |    6 +-
 fs/squashfs/squashfs_fs_sb.h |   40 ++++++------
 fs/squashfs/super.c          |   49 +++++++-------
 fs/squashfs/symlink.c        |    1 -
 fs/squashfs/zlib_wrapper.c   |  150 ++++++++++++++++++++++++++++++++++++++++++
 18 files changed, 335 insertions(+), 128 deletions(-)
 create mode 100644 fs/squashfs/decompressor.c
 create mode 100644 fs/squashfs/decompressor.h
 create mode 100644 fs/squashfs/zlib_wrapper.c
#1 lore raw
Quoted 10 lines · Phillip Lougher

Hi Linus,

Please consider pulling the following revised Squashfs update for 2.6.34-rc1. I have removed all the lzma/bunzip2/inflate/lzo code changes (which as far as I know were the blocking issue previously).

What remains in the pull request is a clean-up/refactoring of the zlib wrapper code, outline knowledge of lzma/lzo compressed filesystems (unsupported, but it gives users an understandable error message when they try to mount them), and some trivial code tidying.

I saw that Linus pulled this and some earlier related packages. I am not sure if I should expect working lzma squashfs in 2.6.34 right now, or if I still need to wait a bit?

P.S.
Thanks for working on this!

#2 lore raw
Quoted 4 lines · Bruno Wolff III

I saw that Linus pulled this and some earlier related packages. I am not sure if I should expect working lzma squashfs in 2.6.34 right now, or if I still need to wait a bit?

I believe I correctly tested this and found that I indeed do have to wait for more to happen for lzma support. But it didn't seem to cause a problem for zlib support.

#3 lore raw
In reply to Phillip Lougher
Quoted 52 lines · Phillip Lougher

Hi Linus,

Please consider pulling the following revised Squashfs update for 2.6.34-rc1. I have removed all the lzma/bunzip2/inflate/lzo code changes (which as far as I know were the blocking issue previously).

What remains in the pull request is a clean-up/refactoring of the zlib wrapper code, outline knowledge of lzma/lzo compressed filesystems (unsupported, but it gives users an understandable error message when they try to mount them), and some trivial code tidying.

Please pull.

Thanks

Phillip

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

The following changes since commit 7284ce6c9f6153d1777df5f310c959724d1bd446:
Linus Torvalds (1):

        Linux 2.6.33-rc4

are available in the git repository at:

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

Phillip Lougher (6):
Squashfs: move zlib decompression wrapper code into a separate file
Squashfs: factor out remaining zlib dependencies into separate
wrapper file
Squashfs: add a decompressor framework
Squashfs: add decompressor entries for lzma and lzo
Squashfs: get rid of obsolete variable in struct squashfs_sb_info
Squashfs: get rid of obsolete definition in header file

 fs/squashfs/Makefile         |    2 +-
 fs/squashfs/block.c          |   76 ++--------------------
 fs/squashfs/cache.c          |    1 -
 fs/squashfs/decompressor.c   |   68 +++++++++++++++++++
 fs/squashfs/decompressor.h   |   55 +++++++++++++++
 fs/squashfs/dir.c            |    1 -
 fs/squashfs/export.c         |    1 -
 fs/squashfs/file.c           |    1 -
 fs/squashfs/fragment.c       |    1 -
 fs/squashfs/id.c             |    1 -
 fs/squashfs/inode.c          |    1 -
 fs/squashfs/namei.c          |    1 -
 fs/squashfs/squashfs.h       |    8 ++-
 fs/squashfs/squashfs_fs.h    |    6 +-
 fs/squashfs/squashfs_fs_sb.h |   40 ++++++------
Quoted 13 lines
 fs/squashfs/super.c          |   49 +++++++-------
 fs/squashfs/symlink.c        |    1 -
 fs/squashfs/zlib_wrapper.c   |  150 
++++++++++++++++++++++++++++++++++++++++++
 18 files changed, 335 insertions(+), 128 deletions(-)
 create mode 100644 fs/squashfs/decompressor.c
 create mode 100644 fs/squashfs/decompressor.h
 create mode 100644 fs/squashfs/zlib_wrapper.c
Signature · 4 lines
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Current 2.6.34-rc1 squashfs is broken.

I have a large (500M) squashfs root filesystem, which is mounted from initramfs. After mounting I can chroot into it.

With 2.6.34-rc1 seems that some directories are corrupted - e.g. /lib may have only files up to libnss (alphabetically), or that some binaries are not executing - because I see they are all NULLs on read, e.t.c. Basically - the root is not usable. Replacing the fs/squashfs source dir with a 2.6.33's one fixes the problem - so it is the new code issue...

Woody