Squashfs: add a decompressor framework (4c0f0bb2) · Commits · 戴 / test

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

fs/squashfs/block.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@
		#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
		@@ -151,7 +152,7 @@ int squashfs_read_data(struct super_block sb, void *buffer, u64 index,
		}

		if (compressed) {
		length = squashfs_zlib_uncompress(msblk, buffer, bh, b, offset,
		length = squashfs_decompress(msblk, buffer, bh, b, offset,
		length, srclength, pages);
		if (length < 0)
		goto read_failure;

fs/squashfs/decompressor.c

0 → 100644

+58 −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_unknown_comp_ops = {
		NULL, NULL, NULL, 0, "unknown", 0
		};

		static const struct squashfs_decompressor *decompressor[] = {
		&squashfs_zlib_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

fs/squashfs/squashfs.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -51,6 +51,9 @@ extern struct squashfs_cache_entry squashfs_get_datablock(struct super_block ,
		u64, int);
		extern int squashfs_read_table(struct super_block , void , u64, int);

		/* decompressor.c */
		extern const struct squashfs_decompressor *squashfs_lookup_decompressor(int);

		/* export.c */
		extern __le64 squashfs_read_inode_lookup_table(struct super_block , u64,
		unsigned int);
		@@ -70,14 +73,8 @@ extern struct inode squashfs_iget(struct super_block , long long,
		unsigned int);
		extern int squashfs_read_inode(struct inode *, long long);

		/* zlib_wrapper.c */
		extern void *squashfs_zlib_init(void);
		extern void squashfs_zlib_free(void *);
		extern int squashfs_zlib_uncompress(struct squashfs_sb_info , void *,
		struct buffer_head **, int, int, int, int, int);

		/*
		* Inodes and files operations
		* Inodes, files and decompressor operations
		*/

		/* dir.c */
		@@ -94,3 +91,6 @@ extern const struct inode_operations squashfs_dir_inode_ops;

		/* symlink.c */
		extern const struct address_space_operations squashfs_symlink_aops;

		/* zlib_wrapper.c */
		extern const struct squashfs_decompressor squashfs_zlib_comp_ops;

Admin message