Merge branch 'waltop' into for-linus

[cascardo/linux.git] / fs / ramfs / file-nommu.c

diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index d532c20..9eead2c 100644 (file)
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -146,9 +146,8 @@ static int ramfs_nommu_resize(struct inode *inode, loff_t newsize, loff_t size)
                        return ret;
        }
 
-       ret = simple_setsize(inode, newsize);
-
-       return ret;
+       truncate_setsize(inode, newsize);
+       return 0;
 }
 
 /*****************************************************************************/
@@ -183,7 +182,7 @@ static int ramfs_nommu_setattr(struct dentry *dentry, struct iattr *ia)
                }
        }
 
-       generic_setattr(inode, ia);
+       setattr_copy(inode, ia);
  out:
        ia->ia_valid = old_ia_valid;
        return ret;