git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[sfrench/cifs-2.6.git]
/
fs
/
xattr.c
diff --git
a/fs/xattr.c
b/fs/xattr.c
index 7b03df6b8be26fbc7483f139063b99e1a0d2b451..4424f7fecf14549b65c62d0cac4b8b692718f426 100644
(file)
--- a/
fs/xattr.c
+++ b/
fs/xattr.c
@@
-23,6
+23,7
@@
#include <linux/posix_acl_xattr.h>
#include <linux/uaccess.h>
#include <linux/posix_acl_xattr.h>
#include <linux/uaccess.h>
+#include "internal.h"
static const char *
strcmp_prefix(const char *a, const char *a_prefix)
static const char *
strcmp_prefix(const char *a, const char *a_prefix)
@@
-502,10
+503,10
@@
SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
if (!f.file)
return error;
audit_file(f.file);
if (!f.file)
return error;
audit_file(f.file);
- error = mnt_want_write_file(f.file);
+ error = mnt_want_write_file
_path
(f.file);
if (!error) {
error = setxattr(f.file->f_path.dentry, name, value, size, flags);
if (!error) {
error = setxattr(f.file->f_path.dentry, name, value, size, flags);
- mnt_drop_write_file(f.file);
+ mnt_drop_write_file
_path
(f.file);
}
fdput(f);
return error;
}
fdput(f);
return error;
@@
-734,10
+735,10
@@
SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
if (!f.file)
return error;
audit_file(f.file);
if (!f.file)
return error;
audit_file(f.file);
- error = mnt_want_write_file(f.file);
+ error = mnt_want_write_file
_path
(f.file);
if (!error) {
error = removexattr(f.file->f_path.dentry, name);
if (!error) {
error = removexattr(f.file->f_path.dentry, name);
- mnt_drop_write_file(f.file);
+ mnt_drop_write_file
_path
(f.file);
}
fdput(f);
return error;
}
fdput(f);
return error;