summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2010-05-14 01:32:21 +0200
committerPhillip Lougher <phillip@lougher.demon.co.uk>2010-05-17 21:02:03 +0200
commitaa5b1894cbc700d7462947c017ca9b7bcda1e8ed (patch)
tree88bf6d219243075a752f6b7e0b17911116bad176
parentsquashfs: add xattr support configure option (diff)
downloadlinux-aa5b1894cbc700d7462947c017ca9b7bcda1e8ed.tar.xz
linux-aa5b1894cbc700d7462947c017ca9b7bcda1e8ed.zip
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 @@
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);