From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754024Ab2HaOHG (ORCPT ); Fri, 31 Aug 2012 10:07:06 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:34097 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752865Ab2HaOHE (ORCPT ); Fri, 31 Aug 2012 10:07:04 -0400 Message-ID: <5040C379.3060909@gmail.com> Date: Fri, 31 Aug 2012 16:00:25 +0200 From: Marco Stornelli User-Agent: Mozilla/5.0 (X11; Linux i686; rv:13.0) Gecko/20120601 Thunderbird/13.0 MIME-Version: 1.0 To: Linux FS Devel CC: Joern Engel , Prasad Joshi , logfs@logfs.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/21] logfs: drop vmtruncate Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removed vmtruncate. Signed-off-by: Marco Stornelli --- fs/logfs/readwrite.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index 5be0abe..e9adf9e 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; -- 1.7.3.4