projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://github.com/openrisc/linux
[linux-2.6-microblaze.git]
/
fs
/
jffs2
/
security.c
diff --git
a/fs/jffs2/security.c
b/fs/jffs2/security.c
index
c2332e3
..
aef5522
100644
(file)
--- a/
fs/jffs2/security.c
+++ b/
fs/jffs2/security.c
@@
-57,6
+57,7
@@
static int jffs2_security_getxattr(const struct xattr_handler *handler,
}
static int jffs2_security_setxattr(const struct xattr_handler *handler,
+ struct user_namespace *mnt_userns,
struct dentry *unused, struct inode *inode,
const char *name, const void *buffer,
size_t size, int flags)