Commit 01a678c5 authored by Phillip Lougher's avatar Phillip Lougher
Browse files

Squashfs: simplify CONFIG_SQUASHFS_LZO handling 



Get rid of messy repeated #if(n)def CONFIG_SQUASHFS_LZO code
in decompressor.c

Signed-off-by: default avatarPhillip Lougher <phillip@lougher.demon.co.uk>
parent 8fcd9721

fs/squashfs/decompressor.c

+2 −6
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 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
@@ -57,13 +57,9 @@ static const struct squashfs_decompressor squashfs_unknown_comp_ops = { 


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

};

fs/squashfs/decompressor.h

+4 −0
Original line number Diff line number Diff line
@@ -57,4 +57,8 @@ static inline int squashfs_decompress(struct squashfs_sb_info *msblk, 
extern const struct squashfs_decompressor squashfs_xz_comp_ops;

#endif



#ifdef CONFIG_SQUASHFS_LZO

extern const struct squashfs_decompressor squashfs_lzo_comp_ops;

#endif



#endif

fs/squashfs/squashfs.h

+0 −3
Original line number Diff line number Diff line
@@ -99,6 +99,3 @@ extern const struct xattr_handler *squashfs_xattr_handlers[]; 


/* zlib_wrapper.c */

extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
 


/* lzo_wrapper.c */

extern const struct squashfs_decompressor squashfs_lzo_comp_ops;