From aa5b1894cbc700d7462947c017ca9b7bcda1e8ed Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 13 May 2010 16:32:21 -0700 Subject: squashfs: xattr_lookup sparse fix Sparse detected that unsigned pointer was being passed as int pointer. Signed-off-by: Stephen Hemminger [fixed up to deal with code refactoring] Signed-off-by: Phillip Lougher --- fs/squashfs/xattr.h | 5 +++-- fs/squashfs/xattr_id.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'fs/squashfs') diff --git a/fs/squashfs/xattr.h b/fs/squashfs/xattr.h index 4a96366bfcc9..9da071ae181c 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 *, long long *); + 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,8 @@ 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, long long *xattr) + unsigned int index, int *count, int *size, + unsigned long long *xattr) { return 0; } diff --git a/fs/squashfs/xattr_id.c b/fs/squashfs/xattr_id.c index a74101244a98..cfb41106098f 100644 --- a/fs/squashfs/xattr_id.c +++ b/fs/squashfs/xattr_id.c @@ -39,7 +39,7 @@ * Map xattr id using the xattr id look up table */ int squashfs_xattr_lookup(struct super_block *sb, unsigned int index, - int *count, int *size, long long *xattr) + int *count, unsigned int *size, unsigned long long *xattr) { struct squashfs_sb_info *msblk = sb->s_fs_info; int block = SQUASHFS_XATTR_BLOCK(index); -- cgit v1.2.3