git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_acl.c
diff --git
a/fs/xfs/linux-2.6/xfs_acl.c
b/fs/xfs/linux-2.6/xfs_acl.c
index
a5dcd6a
..
cac48fe
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_acl.c
+++ b/
fs/xfs/linux-2.6/xfs_acl.c
@@
-264,7
+264,7
@@
xfs_set_mode(struct inode *inode, mode_t mode)
iattr.ia_mode = mode;
iattr.ia_ctime = current_fs_time(inode->i_sb);
- error = -xfs_setattr(XFS_I(inode), &iattr, XFS_ATTR_NOACL);
+ error = -xfs_setattr
_nonsize
(XFS_I(inode), &iattr, XFS_ATTR_NOACL);
}
return error;