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 /mm/shmem.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 7e5030ae18ff..f65f84062db5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -764,10 +764,11 @@ done2: | |||
| 764 | static int shmem_notify_change(struct dentry *dentry, struct iattr *attr) | 764 | static int shmem_notify_change(struct dentry *dentry, struct iattr *attr) |
| 765 | { | 765 | { |
| 766 | struct inode *inode = dentry->d_inode; | 766 | struct inode *inode = dentry->d_inode; |
| 767 | loff_t newsize = attr->ia_size; | ||
| 767 | int error; | 768 | int error; |
| 768 | 769 | ||
| 769 | if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE)) { | 770 | if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE) |
| 770 | loff_t newsize = attr->ia_size; | 771 | && newsize != inode->i_size) { |
| 771 | struct page *page = NULL; | 772 | struct page *page = NULL; |
| 772 | 773 | ||
| 773 | if (newsize < inode->i_size) { | 774 | if (newsize < inode->i_size) { |