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);