mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-28 22:54:05 +08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: Squashfs: fix function prototype Squashfs: fix use of __le64 annotated variable
This commit is contained in:
commit
162164f7e9
@ -158,17 +158,18 @@ static int squashfs_xattr_get(struct inode *inode, int name_index,
|
||||
strncmp(target, name, name_size) == 0) {
|
||||
/* found xattr */
|
||||
if (type & SQUASHFS_XATTR_VALUE_OOL) {
|
||||
__le64 xattr;
|
||||
__le64 xattr_val;
|
||||
u64 xattr;
|
||||
/* val is a reference to the real location */
|
||||
err = squashfs_read_metadata(sb, &val, &start,
|
||||
&offset, sizeof(val));
|
||||
if (err < 0)
|
||||
goto failed;
|
||||
err = squashfs_read_metadata(sb, &xattr, &start,
|
||||
&offset, sizeof(xattr));
|
||||
err = squashfs_read_metadata(sb, &xattr_val,
|
||||
&start, &offset, sizeof(xattr_val));
|
||||
if (err < 0)
|
||||
goto failed;
|
||||
xattr = le64_to_cpu(xattr);
|
||||
xattr = le64_to_cpu(xattr_val);
|
||||
start = SQUASHFS_XATTR_BLK(xattr) +
|
||||
msblk->xattr_table;
|
||||
offset = SQUASHFS_XATTR_OFFSET(xattr);
|
||||
|
@ -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_xattr_id_table(struct super_block *sb,
|
||||
}
|
||||
|
||||
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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user