diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 09:20:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 09:20:13 -0700 |
| commit | 062e27ec1b49d12bdb1ecc94d74b5fee5a5775db (patch) | |
| tree | 28ebc44e789cebe7ec7b52ed74349438cf936eb2 /fs/squashfs/xattr.c | |
| parent | bf25db365428dbd182768baa9850bef7afaac80d (diff) | |
| parent | 66048c381bb1e3a7c6fc69c28721843d6ec11c8c (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: fix checkpatch.pl warnings
Squashfs: fix filename typo
Squashfs: update Kconfig and documentation for LZO
Squashfs: fix block size use in LZO decompressor
Squashfs: Add LZO compression support
squashfs: fix filename in header comment
Squashfs: Make XATTR config name consistent with other file systems
squashfs: fix compiler inline warning
Diffstat (limited to 'fs/squashfs/xattr.c')
| -rw-r--r-- | fs/squashfs/xattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c index c7655e8b31c..652b8541f9c 100644 --- a/fs/squashfs/xattr.c +++ b/fs/squashfs/xattr.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * xattr_id.c + * xattr.c */ #include <linux/init.h> @@ -295,7 +295,7 @@ static const struct xattr_handler squashfs_xattr_security_handler = { .get = squashfs_security_get }; -static inline const struct xattr_handler *squashfs_xattr_handler(int type) +static const struct xattr_handler *squashfs_xattr_handler(int type) { if (type & ~(SQUASHFS_XATTR_PREFIX_MASK | SQUASHFS_XATTR_VALUE_OOL)) /* ignore unrecognised type */ |