Gitweb: http://git.kernel.org/linus/aa5b1894cbc700d7462947c017ca9b7bcda1e8ed
Commit: aa5b1894cbc700d7462947c017ca9b7bcda1e8ed
Parent: 01e5b4e4e897fce8c7e6236bc933c9721c7ee237
Author: Stephen Hemminger <shemminger@vyatta.com>
AuthorDate: Thu May 13 16:32:21 2010 -0700
Committer: Phillip Lougher <phillip@lougher.demon.co.uk>
CommitDate: Mon May 17 20:02:03 2010 +0100
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>
---
fs/squashfs/xattr.h | 5 +++--
fs/squashfs/xattr_id.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/squashfs/xattr.h b/fs/squashfs/xattr.h
index 4a96366..9da071a 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 a741012..cfb4110 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);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
