projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ext2, ext4: warn when mounting with dax enabled
[firefly-linux-kernel-4.4.55.git]
/
fs
/
jffs2
/
xattr.c
diff --git
a/fs/jffs2/xattr.c
b/fs/jffs2/xattr.c
index 762c7a3cf43d1b650757d25e2d38830b2b567f37..4c2c03663533dc2fbf1e0c24dc5b08dec6ea943f 100644
(file)
--- a/
fs/jffs2/xattr.c
+++ b/
fs/jffs2/xattr.c
@@
-960,7
+960,7
@@
static const struct xattr_handler *xprefix_to_handler(int xprefix) {
ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
{
ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
{
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
struct jffs2_inode_cache *ic = f->inocache;
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
struct jffs2_inode_cache *ic = f->inocache;
@@
-1001,11
+1001,12
@@
ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
if (!xhandle)
continue;
if (buffer) {
if (!xhandle)
continue;
if (buffer) {
- rc = xhandle->list(dentry, buffer+len, size-len,
- xd->xname, xd->name_len, xd->flags);
+ rc = xhandle->list(xhandle, dentry, buffer + len,
+ size - len, xd->xname,
+ xd->name_len);
} else {
} else {
- rc = xhandle->list(
dentry, NULL, 0, xd->xname
,
- xd->
name_len, xd->flags
);
+ rc = xhandle->list(
xhandle, dentry, NULL, 0
,
+ xd->
xname, xd->name_len
);
}
if (rc < 0)
goto out;
}
if (rc < 0)
goto out;
@@
-1266,7
+1267,6
@@
int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_
if (rc) {
JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n",
__func__, rc, totlen);
if (rc) {
JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n",
__func__, rc, totlen);
- rc = rc ? rc : -EBADFD;
goto out;
}
rc = save_xattr_ref(c, ref);
goto out;
}
rc = save_xattr_ref(c, ref);