From 89ef2d4d9a4d55a7fec645c71b753e2a06c50ee6 Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <linux@treblig.org>
Date: Mon, 13 Dec 2010 17:09:52 +0000
Subject: [PATCH] --- yaml --- r: 231659 b: refs/heads/master c:
 274052ef0bac011249925f6616d147b1491fc601 h: refs/heads/master i:   231657:
 c4eb835ac325172acf33a64d1c2ca18fefed4695   231655:
 07e6fee62c9e67089acf2213e97c22980e73d3a1 v: v3

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

diff --git a/[refs] b/[refs]
index f8a082a84b85..2e1812b14b9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0bb6bda43e20aa1db5774c73a519cd52c463a55
+refs/heads/master: 274052ef0bac011249925f6616d147b1491fc601
diff --git a/trunk/fs/hpfs/inode.c b/trunk/fs/hpfs/inode.c
index 56f0da1cfd10..1ae35baa539e 100644
--- a/trunk/fs/hpfs/inode.c
+++ b/trunk/fs/hpfs/inode.c
@@ -281,7 +281,7 @@ int hpfs_setattr(struct dentry *dentry, struct iattr *attr)
 	    attr->ia_size != i_size_read(inode)) {
 		error = vmtruncate(inode, attr->ia_size);
 		if (error)
-			return error;
+			goto out_unlock;
 	}
 
 	setattr_copy(inode, attr);