check ATTR_SIZE contraints in inode_change_ok

[net-next-2.6.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 0a43505eeaec1ecebd7615b42ad0bf818ea7c29f..33222ba256fbd42dc91d85b7be1ee570a852a170 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -805,11 +805,10 @@ static int shmem_notify_change(struct dentry *dentry, struct iattr *attr)
                        }
                }
 
-               error = simple_setsize(inode, newsize);
+               /* XXX(truncate): truncate_setsize should be called last */
+               truncate_setsize(inode, newsize);
                if (page)
                        page_cache_release(page);
-               if (error)
-                       return error;
                shmem_truncate_range(inode, newsize, (loff_t)-1);
        }