aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2010-05-13 19:32:21 -0400
committerPhillip Lougher <phillip@lougher.demon.co.uk>2010-05-17 15:02:03 -0400
commitaa5b1894cbc700d7462947c017ca9b7bcda1e8ed (patch)
tree88bf6d219243075a752f6b7e0b17911116bad176
parent01e5b4e4e897fce8c7e6236bc933c9721c7ee237 (diff)
squashfs: xattr_lookup sparse fix
Sparse detected that unsigned pointer was being passed as int pointer. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> [fixed up to deal with code refactoring] Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
-rw-r--r--fs/squashfs/xattr.h5
-rw-r--r--fs/squashfs/xattr_id.c2
2 files changed, 4 insertions, 3 deletions
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 @@
25extern __le64 *squashfs_read_xattr_id_table(struct super_block *, u64, 25extern __le64 *squashfs_read_xattr_id_table(struct super_block *, u64,
26 u64 *, int *); 26 u64 *, int *);
27extern int squashfs_xattr_lookup(struct super_block *, unsigned int, int *, 27extern int squashfs_xattr_lookup(struct super_block *, unsigned int, int *,
28 int *, long long *); 28 int *, unsigned long long *);
29#else 29#else
30static inline __le64 *squashfs_read_xattr_id_table(struct super_block *sb, 30static inline __le64 *squashfs_read_xattr_id_table(struct super_block *sb,
31 u64 start, u64 *xattr_table_start, int *xattr_ids) 31 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,
35} 35}
36 36
37static inline int squashfs_xattr_lookup(struct super_block *sb, 37static inline int squashfs_xattr_lookup(struct super_block *sb,
38 unsigned int index, int *count, int *size, long long *xattr) 38 unsigned int index, int *count, int *size,
39 unsigned long long *xattr)
39{ 40{
40 return 0; 41 return 0;
41} 42}
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 @@
39 * Map xattr id using the xattr id look up table 39 * Map xattr id using the xattr id look up table
40 */ 40 */
41int squashfs_xattr_lookup(struct super_block *sb, unsigned int index, 41int squashfs_xattr_lookup(struct super_block *sb, unsigned int index,
42 int *count, int *size, long long *xattr) 42 int *count, unsigned int *size, unsigned long long *xattr)
43{ 43{
44 struct squashfs_sb_info *msblk = sb->s_fs_info; 44 struct squashfs_sb_info *msblk = sb->s_fs_info;
45 int block = SQUASHFS_XATTR_BLOCK(index); 45 int block = SQUASHFS_XATTR_BLOCK(index);