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
/
ubifs
/
file.c
diff --git
a/fs/ubifs/file.c
b/fs/ubifs/file.c
index 4360c6625e77e0d84d23c114942adb5f7e8d02fb..a746982fbcda53b886d60f145a2b43ab85477380 100644
(file)
--- a/
fs/ubifs/file.c
+++ b/
fs/ubifs/file.c
@@
-1262,7
+1262,7
@@
int ubifs_setattr(struct dentry *dentry, struct iattr *attr)
dbg_gen("ino %lu, mode %#x, ia_valid %#x",
inode->i_ino, inode->i_mode, attr->ia_valid);
- err =
inode_change_ok(inode
, attr);
+ err =
setattr_prepare(dentry
, attr);
if (err)
return err;