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 tag 'fuse-update-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[sfrench/cifs-2.6.git]
/
fs
/
fuse
/
ioctl.c
diff --git
a/fs/fuse/ioctl.c
b/fs/fuse/ioctl.c
index 8ba1545e01f95d1ba1136b98d10670d14e35d236..8e01bfdfc4303ae75c081d46640a711a00e073e5 100644
(file)
--- a/
fs/fuse/ioctl.c
+++ b/
fs/fuse/ioctl.c
@@
-473,7
+473,7
@@
cleanup:
return err;
}
-int fuse_fileattr_set(struct
user_namespace *mnt_userns
,
+int fuse_fileattr_set(struct
mnt_idmap *idmap
,
struct dentry *dentry, struct fileattr *fa)
{
struct inode *inode = d_inode(dentry);