diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 21:12:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 21:12:39 -0700 |
| commit | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (patch) | |
| tree | bf68721fb65b64392177f498a9ba61ef027b2b3d /mm | |
| parent | 90ec7819737d42a0ad1c2df1ff56016facae3c6e (diff) | |
| parent | 01afaf61983d08ed1c9e5e8f2fcf4f40e9008033 (diff) | |
| download | linux-7f0d384cafabfbb56663ee6944c18fc0450fc5d6.tar.gz linux-7f0d384cafabfbb56663ee6944c18fc0450fc5d6.tar.bz2 linux-7f0d384cafabfbb56663ee6944c18fc0450fc5d6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
Minix: Clean up left over label
fix truncate inode time modification breakage
fix setattr error handling in sysfs, configfs
fcntl: return -EFAULT if copy_to_user fails
wrong type for 'magic' argument in simple_fill_super()
fix the deadlock in qib_fs
mqueue doesn't need make_bad_inode()
Diffstat (limited to 'mm')
| -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: static int shmem_notify_change(struct dentry *dentry, struct iattr *attr) { struct inode *inode = dentry->d_inode; + loff_t newsize = attr->ia_size; int error; - if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE)) { - loff_t newsize = attr->ia_size; + if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE) + && newsize != inode->i_size) { struct page *page = NULL; if (newsize < inode->i_size) { |