From: Marco Stornelli <marco.stornelli@gmail.com>
Date: Sat, 15 Dec 2012 10:55:42 +0000 (+0100)
Subject: logfs: drop vmtruncate
X-Git-Tag: v3.8-rc1~13^2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dfc2821e87893695bf4751fcbbdb56f42fa2985;p=thirdparty%2Fkernel%2Flinux.git

logfs: drop vmtruncate

Removed vmtruncate

Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index e1a3b6bf63244..9a59cbade2fb5 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;