diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 08:35:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 08:35:30 +0100 |
| commit | d38e781ea035456c742605fb21d0dd3c755b7b0b (patch) | |
| tree | 53bda2561a47f747ab4caf1119993cc181780db7 /fs/squashfs/xattr.h | |
| parent | mei: Move uuid_le_cmp() to its only user (diff) | |
| parent | Linux 6.2-rc7 (diff) | |
| download | linux-d38e781ea035456c742605fb21d0dd3c755b7b0b.tar.xz linux-d38e781ea035456c742605fb21d0dd3c755b7b0b.zip | |
Merge 6.2-rc7 into char-misc-next
We need the char-misc driver fixes in here as other patches depend on
them.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/squashfs/xattr.h')
| -rw-r--r-- | fs/squashfs/xattr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/squashfs/xattr.h b/fs/squashfs/xattr.h index d8a270d3ac4c..f1a463d8bfa0 100644 --- a/fs/squashfs/xattr.h +++ b/fs/squashfs/xattr.h @@ -10,12 +10,12 @@ #ifdef CONFIG_SQUASHFS_XATTR extern __le64 *squashfs_read_xattr_id_table(struct super_block *, u64, - u64 *, int *); + u64 *, unsigned int *); extern int squashfs_xattr_lookup(struct super_block *, unsigned int, int *, 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) + u64 start, u64 *xattr_table_start, unsigned int *xattr_ids) { struct squashfs_xattr_id_table *id_table; |