Commit b24bc1e6 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: get rid of obsolete definition in header file
  Squashfs: get rid of obsolete variable in struct squashfs_sb_info
  Squashfs: add decompressor entries for lzma and lzo
  Squashfs: add a decompressor framework
  Squashfs: factor out remaining zlib dependencies into separate wrapper file
  Squashfs: move zlib decompression wrapper code into a separate file
parents 64ba9926 06862f88

fs/squashfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 


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
 
squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o

fs/squashfs/block.c

+5 −71
Original line number Diff line number Diff line
@@ -29,15 +29,14 @@ 
#include <linux/fs.h>

#include <linux/vfs.h>

#include <linux/slab.h>

#include <linux/mutex.h>

#include <linux/string.h>

#include <linux/buffer_head.h>

#include <linux/zlib.h>



#include "squashfs_fs.h"

#include "squashfs_fs_sb.h"

#include "squashfs_fs_i.h"

#include "squashfs.h"

#include "decompressor.h"



/*

 * Read the metadata block length, this is stored in the first two
@@ -153,72 +152,10 @@ int squashfs_read_data(struct super_block *sb, void **buffer, u64 index, 
	}



	if (compressed) {

		int zlib_err = 0, zlib_init = 0;



		/*

		 * Uncompress block.

		 */



		mutex_lock(&msblk->read_data_mutex);



		msblk->stream.avail_out = 0;

		msblk->stream.avail_in = 0;



		bytes = length;

		do {

			if (msblk->stream.avail_in == 0 && k < b) {

				avail = min(bytes, msblk->devblksize - offset);

				bytes -= avail;

				wait_on_buffer(bh[k]);

				if (!buffer_uptodate(bh[k]))

					goto release_mutex;



				if (avail == 0) {

					offset = 0;

					put_bh(bh[k++]);

					continue;

				}



				msblk->stream.next_in = bh[k]->b_data + offset;

				msblk->stream.avail_in = avail;

				offset = 0;

			}



			if (msblk->stream.avail_out == 0 && page < pages) {

				msblk->stream.next_out = buffer[page++];

				msblk->stream.avail_out = PAGE_CACHE_SIZE;

			}



			if (!zlib_init) {

				zlib_err = zlib_inflateInit(&msblk->stream);

				if (zlib_err != Z_OK) {

					ERROR("zlib_inflateInit returned"

						" unexpected result 0x%x,"

						" srclength %d\n", zlib_err,

						srclength);

					goto release_mutex;

				}

				zlib_init = 1;

			}



			zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);



			if (msblk->stream.avail_in == 0 && k < b)

				put_bh(bh[k++]);

		} while (zlib_err == Z_OK);



		if (zlib_err != Z_STREAM_END) {

			ERROR("zlib_inflate error, data probably corrupt\n");

			goto release_mutex;

		}



		zlib_err = zlib_inflateEnd(&msblk->stream);

		if (zlib_err != Z_OK) {

			ERROR("zlib_inflate error, data probably corrupt\n");

			goto release_mutex;

		}

		length = msblk->stream.total_out;

		mutex_unlock(&msblk->read_data_mutex);

		length = squashfs_decompress(msblk, buffer, bh, b, offset,

			 length, srclength, pages);

		if (length < 0)

			goto read_failure;

	} else {

		/*

		 * Block is uncompressed.
@@ -255,9 +192,6 @@ int squashfs_read_data(struct super_block *sb, void **buffer, u64 index, 
	kfree(bh);

	return length;



release_mutex:

	mutex_unlock(&msblk->read_data_mutex);



block_release:

	for (; k < b; k++)

		put_bh(bh[k]);

fs/squashfs/cache.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <linux/sched.h>

#include <linux/spinlock.h>

#include <linux/wait.h>

#include <linux/zlib.h>

#include <linux/pagemap.h>



#include "squashfs_fs.h"

fs/squashfs/decompressor.c

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * Squashfs - a compressed read only filesystem for Linux

 *

 * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

 * Phillip Lougher <phillip@lougher.demon.co.uk>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2,

 * or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 *

 * decompressor.c

 */



#include <linux/types.h>

#include <linux/mutex.h>

#include <linux/buffer_head.h>



#include "squashfs_fs.h"

#include "squashfs_fs_sb.h"

#include "squashfs_fs_i.h"

#include "decompressor.h"

#include "squashfs.h"



/*

 * This file (and decompressor.h) implements a decompressor framework for

 * Squashfs, allowing multiple decompressors to be easily supported

 */



static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {

	NULL, NULL, NULL, LZMA_COMPRESSION, "lzma", 0

};



static const struct squashfs_decompressor squashfs_lzo_unsupported_comp_ops = {

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

};



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,

	&squashfs_lzo_unsupported_comp_ops,

	&squashfs_unknown_comp_ops

};





const struct squashfs_decompressor *squashfs_lookup_decompressor(int id)

{

	int i;



	for (i = 0; decompressor[i]->id; i++)

		if (id == decompressor[i]->id)

			break;



	return decompressor[i];

}

fs/squashfs/decompressor.h

0 → 100644
+55 −0
Original line number Diff line number Diff line 
#ifndef DECOMPRESSOR_H

#define DECOMPRESSOR_H

/*

 * Squashfs - a compressed read only filesystem for Linux

 *

 * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

 * Phillip Lougher <phillip@lougher.demon.co.uk>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2,

 * or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 *

 * decompressor.h

 */



struct squashfs_decompressor {

	void	*(*init)(struct squashfs_sb_info *);

	void	(*free)(void *);

	int	(*decompress)(struct squashfs_sb_info *, void **,

		struct buffer_head **, int, int, int, int, int);

	int	id;

	char	*name;

	int	supported;

};



static inline void *squashfs_decompressor_init(struct squashfs_sb_info *msblk)

{

	return msblk->decompressor->init(msblk);

}



static inline void squashfs_decompressor_free(struct squashfs_sb_info *msblk,

	void *s)

{

	if (msblk->decompressor)

		msblk->decompressor->free(s);

}



static inline int squashfs_decompress(struct squashfs_sb_info *msblk,

	void **buffer, struct buffer_head **bh, int b, int offset, int length,

	int srclength, int pages)

{

	return msblk->decompressor->decompress(msblk, buffer, bh, b, offset,

		length, srclength, pages);

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE