From 636dd5926d9160ce43d4a22a1d09390e13e27808 Mon Sep 17 00:00:00 2001 From: Marco Stornelli Date: Sat, 15 Dec 2012 11:55:42 +0100 Subject: [PATCH] --- yaml --- r: 347805 b: refs/heads/master c: 5dfc2821e87893695bf4751fcbbdb56f42fa2985 h: refs/heads/master i: 347803: 193fcbe34b57573a3cf35c3c42e53b99eb36409c v: v3 --- [refs] | 2 +- trunk/fs/logfs/readwrite.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7c7d25aa5ca8..8d8ddc772409 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d506848567b529e57dfbcc4e28747b9211ffb7e5 +refs/heads/master: 5dfc2821e87893695bf4751fcbbdb56f42fa2985 diff --git a/trunk/fs/logfs/readwrite.c b/trunk/fs/logfs/readwrite.c index e1a3b6bf6324..9a59cbade2fb 100644 --- a/trunk/fs/logfs/readwrite.c +++ b/trunk/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;