diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /fs/ext2/inode.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'fs/ext2/inode.c')
| -rw-r--r-- | fs/ext2/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 19214435b752..3675088cb88c 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
| @@ -1552,7 +1552,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr) | |||
| 1552 | if (error) | 1552 | if (error) |
| 1553 | return error; | 1553 | return error; |
| 1554 | } | 1554 | } |
| 1555 | if (iattr->ia_valid & ATTR_SIZE) { | 1555 | if (iattr->ia_valid & ATTR_SIZE && iattr->ia_size != inode->i_size) { |
| 1556 | error = ext2_setsize(inode, iattr->ia_size); | 1556 | error = ext2_setsize(inode, iattr->ia_size); |
| 1557 | if (error) | 1557 | if (error) |
| 1558 | return error; | 1558 | return error; |