lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Squashfs: simplify CONFIG_SQUASHFS_LZO handling

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

Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
This commit is contained in:
Phillip Lougher
2011-01-05 18:23:53 +00:00
parent 8fcd97216f
commit 01a678c5a2
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/squashfs/decompressor.c
View File

@@ -40,7 +40,7 @@ static const struct squashfs_decompressor squashfs_lzma_unsupported_comp_ops = {
}; };
#ifndef CONFIG_SQUASHFS_LZO #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 NULL, NULL, NULL, LZO_COMPRESSION, "lzo", 0
}; };
#endif #endif
@@ -57,13 +57,9 @@ static const struct squashfs_decompressor squashfs_unknown_comp_ops = {
static const struct squashfs_decompressor *decompressor[] = { static const struct squashfs_decompressor *decompressor[] = {
&squashfs_zlib_comp_ops, &squashfs_zlib_comp_ops,
&squashfs_lzma_unsupported_comp_ops,
#ifdef CONFIG_SQUASHFS_LZO
&squashfs_lzo_comp_ops, &squashfs_lzo_comp_ops,
#else
&squashfs_lzo_unsupported_comp_ops,
#endif
&squashfs_xz_comp_ops, &squashfs_xz_comp_ops,
&squashfs_lzma_unsupported_comp_ops,
&squashfs_unknown_comp_ops &squashfs_unknown_comp_ops
}; };

4
fs/squashfs/decompressor.h
View File

@@ -57,4 +57,8 @@ static inline int squashfs_decompress(struct squashfs_sb_info *msblk,
extern const struct squashfs_decompressor squashfs_xz_comp_ops; extern const struct squashfs_decompressor squashfs_xz_comp_ops;
#endif #endif
#ifdef CONFIG_SQUASHFS_LZO
extern const struct squashfs_decompressor squashfs_lzo_comp_ops;
#endif
#endif #endif

3
fs/squashfs/squashfs.h
View File

@@ -99,6 +99,3 @@ extern const struct xattr_handler *squashfs_xattr_handlers[];
/* zlib_wrapper.c */ /* zlib_wrapper.c */
extern const struct squashfs_decompressor squashfs_zlib_comp_ops; extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
/* lzo_wrapper.c */
extern const struct squashfs_decompressor squashfs_lzo_comp_ops;