diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 12:11:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 12:11:13 -0800 |
| commit | 5520ebd308927a3beba599a2b68fa8c52f41f43b (patch) | |
| tree | b0395c15af7d096e6e6172a9d47bb7a8dec6add0 /fs/squashfs/squashfs.h | |
| parent | d3072e6a7e9bf7aca200370317f8e297be360b17 (diff) | |
| parent | 01a678c5a2f41663b8faf03d17e2bbdbf44158a9 (diff) | |
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: simplify CONFIG_SQUASHFS_LZO handling
Squashfs: move squashfs_i() definition from squashfs.h
Squashfs: get rid of default n in Kconfig
Squashfs: add missing check in zlib_wrapper
Squashfs: remove unnecessary variable in zlib_wrapper
Squashfs: Add XZ compression configuration option
Squashfs: add XZ compression support
Diffstat (limited to 'fs/squashfs/squashfs.h')
| -rw-r--r-- | fs/squashfs/squashfs.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h index 5d45569d5f7..ba729d80887 100644 --- a/fs/squashfs/squashfs.h +++ b/fs/squashfs/squashfs.h @@ -27,11 +27,6 @@ #define WARNING(s, args...) pr_warning("SQUASHFS: "s, ## args) -static inline struct squashfs_inode_info *squashfs_i(struct inode *inode) -{ - return list_entry(inode, struct squashfs_inode_info, vfs_inode); -} - /* block.c */ extern int squashfs_read_data(struct super_block *, void **, u64, int, u64 *, int, int); @@ -104,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; |