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 'master' into for-2.6.35
[pandora-kernel.git]
/
fs
/
ext3
/
inode.c
diff --git
a/fs/ext3/inode.c
b/fs/ext3/inode.c
index
ea33bdf
..
735f019
100644
(file)
--- a/
fs/ext3/inode.c
+++ b/
fs/ext3/inode.c
@@
-3151,7
+3151,7
@@
int ext3_setattr(struct dentry *dentry, struct iattr *attr)
if (error)
return error;
- if (i
a_valid & ATTR_SIZE
)
+ if (i
s_quota_modification(inode, attr)
)
dquot_initialize(inode);
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {