From 2a2859aa999d4ce8eab695c29863de56e722c30e Mon Sep 17 00:00:00 2001
From: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Date: Thu, 3 Feb 2011 03:16:25 +0000
Subject: [PATCH] --- yaml --- r: 233010 b: refs/heads/master c:
 554233a6e0e8557e8e81e54cc70628d101291122 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9ea81e3c26dc..3678c706171f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c14874acc71180553fb5aba528e3cf57c5b958b
+refs/heads/master: 554233a6e0e8557e8e81e54cc70628d101291122
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 36bc3f49ebf9..c9bc0afdbfc6 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -2646,7 +2646,7 @@ int btrfs_unlink_inode(struct btrfs_trans_handle *trans,
 	path = btrfs_alloc_path();
 	if (!path) {
 		ret = -ENOMEM;
-		goto err;
+		goto out;
 	}
 
 	path->leave_spinning = 1;