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
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
[firefly-linux-kernel-4.4.55.git]
/
fs
/
cachefiles
/
xattr.c
diff --git
a/fs/cachefiles/xattr.c
b/fs/cachefiles/xattr.c
index a8a68745e11d45b0c093501e359d1190546f788b..d31c1a72d8a5ba90255ff7537a824b9c8036b749 100644
(file)
--- a/
fs/cachefiles/xattr.c
+++ b/
fs/cachefiles/xattr.c
@@
-33,7
+33,7
@@
int cachefiles_check_object_type(struct cachefiles_object *object)
int ret;
ASSERT(dentry);
int ret;
ASSERT(dentry);
- ASSERT(d
entry->d_inode
);
+ ASSERT(d
_backing_inode(dentry)
);
if (!object->fscache.cookie)
strcpy(type, "C3");
if (!object->fscache.cookie)
strcpy(type, "C3");
@@
-52,7
+52,7
@@
int cachefiles_check_object_type(struct cachefiles_object *object)
if (ret != -EEXIST) {
pr_err("Can't set xattr on %pd [%lu] (err %d)\n",
if (ret != -EEXIST) {
pr_err("Can't set xattr on %pd [%lu] (err %d)\n",
- dentry, d
entry->d_inode
->i_ino,
+ dentry, d
_backing_inode(dentry)
->i_ino,
-ret);
goto error;
}
-ret);
goto error;
}
@@
-64,7
+64,7
@@
int cachefiles_check_object_type(struct cachefiles_object *object)
goto bad_type_length;
pr_err("Can't read xattr on %pd [%lu] (err %d)\n",
goto bad_type_length;
pr_err("Can't read xattr on %pd [%lu] (err %d)\n",
- dentry, d
entry->d_inode
->i_ino,
+ dentry, d
_backing_inode(dentry)
->i_ino,
-ret);
goto error;
}
-ret);
goto error;
}
@@
-84,14
+84,14
@@
error:
bad_type_length:
pr_err("Cache object %lu type xattr length incorrect\n",
bad_type_length:
pr_err("Cache object %lu type xattr length incorrect\n",
- d
entry->d_inode
->i_ino);
+ d
_backing_inode(dentry)
->i_ino);
ret = -EIO;
goto error;
bad_type:
xtype[2] = 0;
pr_err("Cache object %pd [%lu] type %s not %s\n",
ret = -EIO;
goto error;
bad_type:
xtype[2] = 0;
pr_err("Cache object %pd [%lu] type %s not %s\n",
- dentry, d
entry->d_inode
->i_ino,
+ dentry, d
_backing_inode(dentry)
->i_ino,
xtype, type);
ret = -EIO;
goto error;
xtype, type);
ret = -EIO;
goto error;
@@
-165,7
+165,7
@@
int cachefiles_check_auxdata(struct cachefiles_object *object)
int ret;
ASSERT(dentry);
int ret;
ASSERT(dentry);
- ASSERT(d
entry->d_inode
);
+ ASSERT(d
_backing_inode(dentry)
);
ASSERT(object->fscache.cookie->def->check_aux);
auxbuf = kmalloc(sizeof(struct cachefiles_xattr) + 512, GFP_KERNEL);
ASSERT(object->fscache.cookie->def->check_aux);
auxbuf = kmalloc(sizeof(struct cachefiles_xattr) + 512, GFP_KERNEL);
@@
-204,7
+204,7
@@
int cachefiles_check_object_xattr(struct cachefiles_object *object,
_enter("%p,#%d", object, auxdata->len);
ASSERT(dentry);
_enter("%p,#%d", object, auxdata->len);
ASSERT(dentry);
- ASSERT(d
entry->d_inode
);
+ ASSERT(d
_backing_inode(dentry)
);
auxbuf = kmalloc(sizeof(struct cachefiles_xattr) + 512, cachefiles_gfp);
if (!auxbuf) {
auxbuf = kmalloc(sizeof(struct cachefiles_xattr) + 512, cachefiles_gfp);
if (!auxbuf) {
@@
-225,7
+225,7
@@
int cachefiles_check_object_xattr(struct cachefiles_object *object,
cachefiles_io_error_obj(object,
"Can't read xattr on %lu (err %d)",
cachefiles_io_error_obj(object,
"Can't read xattr on %lu (err %d)",
- d
entry->d_inode
->i_ino, -ret);
+ d
_backing_inode(dentry)
->i_ino, -ret);
goto error;
}
goto error;
}
@@
-276,7
+276,7
@@
int cachefiles_check_object_xattr(struct cachefiles_object *object,
cachefiles_io_error_obj(object,
"Can't update xattr on %lu"
" (error %d)",
cachefiles_io_error_obj(object,
"Can't update xattr on %lu"
" (error %d)",
- d
entry->d_inode
->i_ino, -ret);
+ d
_backing_inode(dentry)
->i_ino, -ret);
goto error;
}
}
goto error;
}
}
@@
-291,7
+291,7
@@
error:
bad_type_length:
pr_err("Cache object %lu xattr length incorrect\n",
bad_type_length:
pr_err("Cache object %lu xattr length incorrect\n",
- d
entry->d_inode
->i_ino);
+ d
_backing_inode(dentry)
->i_ino);
ret = -EIO;
goto error;
ret = -EIO;
goto error;
@@
-316,7
+316,7
@@
int cachefiles_remove_object_xattr(struct cachefiles_cache *cache,
cachefiles_io_error(cache,
"Can't remove xattr from %lu"
" (error %d)",
cachefiles_io_error(cache,
"Can't remove xattr from %lu"
" (error %d)",
- d
entry->d_inode
->i_ino, -ret);
+ d
_backing_inode(dentry)
->i_ino, -ret);
}
_leave(" = %d", ret);
}
_leave(" = %d", ret);