Merge branch 'master' into for-next

[linux-imx.git] / fs / hpfs / inode.c

diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 405ab77db39cf2de1dd56ded99beb4073c2c5742..9edeeb0ea97ef885c8910e62fcd73eecb8128daf 100644 (file)
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -277,9 +277,12 @@ int hpfs_setattr(struct dentry *dentry, struct iattr *attr)
 
        if ((attr->ia_valid & ATTR_SIZE) &&
            attr->ia_size != i_size_read(inode)) {
-               error = vmtruncate(inode, attr->ia_size);
+               error = inode_newsize_ok(inode, attr->ia_size);
                if (error)
                        goto out_unlock;
+
+               truncate_setsize(inode, attr->ia_size);
+               hpfs_truncate(inode);
        }
 
        setattr_copy(inode, attr);