summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMarco Stornelli <marco.stornelli@gmail.com>2012-12-15 11:55:42 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2012-12-20 18:40:53 -0500
commit5dfc2821e87893695bf4751fcbbdb56f42fa2985 (patch)
treee5cde4e7209010bbcfed91b04b45ab535875e9cc /fs
parentd506848567b529e57dfbcc4e28747b9211ffb7e5 (diff)
logfs: drop vmtruncate
Removed vmtruncate Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/logfs/readwrite.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index e1a3b6bf6324..9a59cbade2fb 100644
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -1887,9 +1887,15 @@ int logfs_truncate(struct inode *inode, u64 target)
logfs_put_wblocks(sb, NULL, 1);
}
- if (!err)
- err = vmtruncate(inode, target);
+ if (!err) {
+ err = inode_newsize_ok(inode, target);
+ if (err)
+ goto out;
+
+ truncate_setsize(inode, target);
+ }
+ out:
/* I don't trust error recovery yet. */
WARN_ON(err);
return err;