From d0fe0ecc3a657913eaf54d809c4f64a5e56850fb Mon Sep 17 00:00:00 2001
From: Marco Stornelli <marco.stornelli@gmail.com>
Date: Sat, 15 Dec 2012 11:57:03 +0100
Subject: [PATCH] --- yaml --- r: 347807 b: refs/heads/master c:
 3e7a806928ac2dcae1423d6879e4f7e86e59bb9e h: refs/heads/master i:   347805:
 636dd5926d9160ce43d4a22a1d09390e13e27808   347803:
 193fcbe34b57573a3cf35c3c42e53b99eb36409c   347799:
 4d9d1c65e54cd68ba638e7f6c87509595a283f67   347791:
 9234429ef4d1b7af39d6cbac6bab86cf3d80e5c1   347775:
 1992ce13aed0851923a6ebbd47612c6ae11a5cbc v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ncpfs/inode.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 01bc77dad61e..b20f69f607cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fc7cd00f616e38973fe3acd0dc7e473da94c52e
+refs/heads/master: 3e7a806928ac2dcae1423d6879e4f7e86e59bb9e
diff --git a/trunk/fs/ncpfs/inode.c b/trunk/fs/ncpfs/inode.c
index d7e9fe77188a..1acdad7fcec7 100644
--- a/trunk/fs/ncpfs/inode.c
+++ b/trunk/fs/ncpfs/inode.c
@@ -976,9 +976,7 @@ int ncp_notify_change(struct dentry *dentry, struct iattr *attr)
 			goto out;
 
 		if (attr->ia_size != i_size_read(inode)) {
-			result = vmtruncate(inode, attr->ia_size);
-			if (result)
-				goto out;
+			truncate_setsize(inode, attr->ia_size);
 			mark_inode_dirty(inode);
 		}
 	}