Don't need to explicitly inline this function, it causes a sparse
warning; and GCC will inline it already.
Signed-off-by: Stephen Hemminger <[email protected]>
---
Patch against 2.6.35-rc1
--- a/fs/squashfs/xattr.c 2010-06-01 08:38:44.659739327 -0700
+++ b/fs/squashfs/xattr.c 2010-06-01 08:39:29.731326492 -0700
@@ -295,7 +295,7 @@ static const struct xattr_handler squash
.get = squashfs_security_get
};
-static inline const struct xattr_handler *squashfs_xattr_handler(int type)
+static const struct xattr_handler *squashfs_xattr_handler(int type)
{
if (type & ~(SQUASHFS_XATTR_PREFIX_MASK | SQUASHFS_XATTR_VALUE_OOL))
/* ignore unrecognised type */
The xattr_size is passed to xattr_lookup as a signed integer, when
it is unsigned. Also include xattr.h to get function prototype.
Signed-off-by: Stephen Hemminger <[email protected]>
--- a/fs/squashfs/xattr.h 2010-06-01 08:48:42.539735350 -0700
+++ b/fs/squashfs/xattr.h 2010-06-01 09:02:27.889738545 -0700
@@ -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 *, unsigned long long *);
+ unsigned 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,7 @@ static inline __le64 *squashfs_read_xatt
}
static inline int squashfs_xattr_lookup(struct super_block *sb,
- unsigned int index, int *count, int *size,
+ unsigned int index, int *count, unsigned int *size,
unsigned long long *xattr)
{
return 0;
--- a/fs/squashfs/xattr_id.c 2010-06-01 08:49:21.350077943 -0700
+++ b/fs/squashfs/xattr_id.c 2010-06-01 09:03:35.030052467 -0700
@@ -34,6 +34,7 @@
#include "squashfs_fs_sb.h"
#include "squashfs_fs_i.h"
#include "squashfs.h"
+#include "xattr.h"
/*
* Map xattr id using the xattr id look up table