diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 18:02:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 18:02:21 +0300 |
| commit | 5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4 (patch) | |
| tree | c2f266e82306fa98c78130b0dc79ef9716d3c9c7 /fs/squashfs/lzo_wrapper.c | |
| parent | 0625bef6060fab4aab0e484130b59af5e9ac81bc (diff) | |
| parent | 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 (diff) | |
| download | linux-5818fcc8bd1b27af4d40b8357b91a56cc3fae6a4.tar.xz | |
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: Use vmalloc rather than kmalloc for zlib workspace
Squashfs: handle corruption of directory structure
Squashfs: wrap squashfs_mount() definition
Squashfs: xz_wrapper doesn't need to include squashfs_fs_i.h anymore
Squashfs: Update documentation to include compression options
Squashfs: Update Kconfig help text to include xz compression
Squashfs: add compression options support to xz decompressor
Squashfs: extend decompressor framework to handle compression options
Diffstat (limited to 'fs/squashfs/lzo_wrapper.c')
| -rw-r--r-- | fs/squashfs/lzo_wrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/squashfs/lzo_wrapper.c b/fs/squashfs/lzo_wrapper.c index 7da759e34c52..00f4dfc5f088 100644 --- a/fs/squashfs/lzo_wrapper.c +++ b/fs/squashfs/lzo_wrapper.c @@ -37,7 +37,7 @@ struct squashfs_lzo { void *output; }; -static void *lzo_init(struct squashfs_sb_info *msblk) +static void *lzo_init(struct squashfs_sb_info *msblk, void *buff, int len) { int block_size = max_t(int, msblk->block_size, SQUASHFS_METADATA_SIZE); @@ -58,7 +58,7 @@ failed2: failed: ERROR("Failed to allocate lzo workspace\n"); kfree(stream); - return NULL; + return ERR_PTR(-ENOMEM); } |