Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5b1894 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Phillip Lougher
Browse files

squashfs: xattr_lookup sparse fix 



Sparse detected that unsigned pointer was being passed as int pointer.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
[fixed up to deal with code refactoring]
Signed-off-by: default avatarPhillip Lougher <phillip@lougher.demon.co.uk>
parent 01e5b4e4

fs/squashfs/xattr.h

+3 −2
Original line number Diff line number Diff line
@@ -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;

}

fs/squashfs/xattr_id.c

+1 −1
Original line number Diff line number Diff line
@@ -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);