projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
fuse
/
dir.c
diff --git
a/fs/fuse/dir.c
b/fs/fuse/dir.c
index
f7c84ab
..
a430c19
100644
(file)
--- a/
fs/fuse/dir.c
+++ b/
fs/fuse/dir.c
@@
-1604,9
+1604,10
@@
int fuse_flush_times(struct inode *inode, struct fuse_file *ff)
* vmtruncate() doesn't allow for this case, so do the rlimit checking
* and the actual truncation by hand.
*/
* vmtruncate() doesn't allow for this case, so do the rlimit checking
* and the actual truncation by hand.
*/
-int fuse_do_setattr(struct
inode *inode
, struct iattr *attr,
+int fuse_do_setattr(struct
dentry *dentry
, struct iattr *attr,
struct file *file)
{
struct file *file)
{
+ struct inode *inode = d_inode(dentry);
struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_inode *fi = get_fuse_inode(inode);
FUSE_ARGS(args);
struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_inode *fi = get_fuse_inode(inode);
FUSE_ARGS(args);
@@
-1621,7
+1622,7
@@
int fuse_do_setattr(struct inode *inode, struct iattr *attr,
if (!fc->default_permissions)
attr->ia_valid |= ATTR_FORCE;
if (!fc->default_permissions)
attr->ia_valid |= ATTR_FORCE;
- err =
inode_change_ok(inode
, attr);
+ err =
setattr_prepare(dentry
, attr);
if (err)
return err;
if (err)
return err;
@@
-1758,7
+1759,7
@@
static int fuse_setattr(struct dentry *entry, struct iattr *attr)
if (!attr->ia_valid)
return 0;
if (!attr->ia_valid)
return 0;
- ret = fuse_do_setattr(
inode
, attr, file);
+ ret = fuse_do_setattr(
entry
, attr, file);
if (!ret) {
/*
* If filesystem supports acls it may have updated acl xattrs in
if (!ret) {
/*
* If filesystem supports acls it may have updated acl xattrs in