projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
ecryptfs
/
inode.c
diff --git
a/fs/ecryptfs/inode.c
b/fs/ecryptfs/inode.c
index 3f2575ddd45e2bada88414ee0d5da3b971cee4a6..ddccec3124d70f08fefb4d017f86d05a6384cd1a 100644
(file)
--- a/
fs/ecryptfs/inode.c
+++ b/
fs/ecryptfs/inode.c
@@
-927,7
+927,7
@@
static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
}
mutex_unlock(&crypt_stat->cs_mutex);
- rc =
inode_change_ok(inode
, ia);
+ rc =
setattr_prepare(dentry
, ia);
if (rc)
goto out;
if (ia->ia_valid & ATTR_SIZE) {