diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 08:48:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 08:48:58 -0700 |
commit | 162164f7e92da970666e7492fd58644f3c1f8574 (patch) | |
tree | c69448e73d24bf83cd412c04d525eb541a84cdc0 /fs/squashfs/xattr.h | |
parent | d8d048f69a618c531575cb1f398a7186f0532ef2 (diff) | |
parent | 5f3b321da1aa5936c85ed6dec67358239a9d3cfd (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 function prototype
Squashfs: fix use of __le64 annotated variable
Diffstat (limited to 'fs/squashfs/xattr.h')
-rw-r--r-- | fs/squashfs/xattr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/squashfs/xattr.h b/fs/squashfs/xattr.h index 49fe0d719fb..b634efce4bd 100644 --- a/fs/squashfs/xattr.h +++ b/fs/squashfs/xattr.h @@ -25,7 +25,7 @@ extern __le64 *squashfs_read_xattr_id_table(struct super_block *, u64, u64 *, int *); extern int squashfs_xattr_lookup(struct super_block *, unsigned int, int *, - int *, unsigned long long *); + unsigned int *, unsigned long long *); #else static inline __le64 *squashfs_read_xattr_id_table(struct super_block *sb, u64 start, u64 *xattr_table_start, int *xattr_ids) @@ -35,7 +35,7 @@ static inline __le64 *squashfs_read_xattr_id_table(struct super_block *sb, } static inline int squashfs_xattr_lookup(struct super_block *sb, - unsigned int index, int *count, int *size, + unsigned int index, int *count, unsigned int *size, unsigned long long *xattr) { return 0; |