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 tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xattr.c
diff --git
a/fs/xattr.c
b/fs/xattr.c
index 1780f062dbaf1cd504f491af5962f3dfbd8db4ee..e21c119f4f99d8512208a9c08983dd5f9c25d821 100644
(file)
--- a/
fs/xattr.c
+++ b/
fs/xattr.c
@@
-412,7
+412,7
@@
SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
if (!f.file)
return error;
dentry = f.file->f_path.dentry;
if (!f.file)
return error;
dentry = f.file->f_path.dentry;
- audit_inode(NULL, dentry);
+ audit_inode(NULL, dentry
, 0
);
error = mnt_want_write_file(f.file);
if (!error) {
error = setxattr(dentry, name, value, size, flags);
error = mnt_want_write_file(f.file);
if (!error) {
error = setxattr(dentry, name, value, size, flags);
@@
-507,7
+507,7
@@
SYSCALL_DEFINE4(fgetxattr, int, fd, const char __user *, name,
if (!f.file)
return error;
if (!f.file)
return error;
- audit_inode(NULL, f.file->f_path.dentry);
+ audit_inode(NULL, f.file->f_path.dentry
, 0
);
error = getxattr(f.file->f_path.dentry, name, value, size);
fdput(f);
return error;
error = getxattr(f.file->f_path.dentry, name, value, size);
fdput(f);
return error;
@@
-586,7
+586,7
@@
SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
if (!f.file)
return error;
if (!f.file)
return error;
- audit_inode(NULL, f.file->f_path.dentry);
+ audit_inode(NULL, f.file->f_path.dentry
, 0
);
error = listxattr(f.file->f_path.dentry, list, size);
fdput(f);
return error;
error = listxattr(f.file->f_path.dentry, list, size);
fdput(f);
return error;
@@
-655,7
+655,7
@@
SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
if (!f.file)
return error;
dentry = f.file->f_path.dentry;
if (!f.file)
return error;
dentry = f.file->f_path.dentry;
- audit_inode(NULL, dentry);
+ audit_inode(NULL, dentry
, 0
);
error = mnt_want_write_file(f.file);
if (!error) {
error = removexattr(dentry, name);
error = mnt_want_write_file(f.file);
if (!error) {
error = removexattr(dentry, name);
@@
-846,7
+846,7
@@
static int __simple_xattr_set(struct simple_xattrs *xattrs, const char *name,
const void *value, size_t size, int flags)
{
struct simple_xattr *xattr;
const void *value, size_t size, int flags)
{
struct simple_xattr *xattr;
- struct simple_xattr *
uninitialized_var(new_xattr)
;
+ struct simple_xattr *
new_xattr = NULL
;
int err = 0;
/* value == NULL means remove */
int err = 0;
/* value == NULL means remove */