From patchwork Thu Feb 3 03:16:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsutomu Itoh X-Patchwork-Id: 528401 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p133HOqs010796 for ; Thu, 3 Feb 2011 03:17:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755298Ab1BCDRT (ORCPT ); Wed, 2 Feb 2011 22:17:19 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:47880 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755250Ab1BCDRS (ORCPT ); Wed, 2 Feb 2011 22:17:18 -0500 Received: from m3.gw.fujitsu.co.jp (unknown [10.0.50.73]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id C672B3EE0AE for ; Thu, 3 Feb 2011 12:17:14 +0900 (JST) Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id ADEC145DE57 for ; Thu, 3 Feb 2011 12:17:14 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 9905645DE55 for ; Thu, 3 Feb 2011 12:17:14 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 89FAF1DB8038 for ; Thu, 3 Feb 2011 12:17:14 +0900 (JST) Received: from m106.s.css.fujitsu.com (m106.s.css.fujitsu.com [10.249.87.106]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 584C51DB8037 for ; Thu, 3 Feb 2011 12:17:14 +0900 (JST) Received: from m106.css.fujitsu.com (m106 [127.0.0.1]) by m106.s.css.fujitsu.com (Postfix) with ESMTP id 2613C5B90CA; Thu, 3 Feb 2011 12:17:14 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.101.86]) by m106.s.css.fujitsu.com (Postfix) with ESMTP id B68115B8EE3; Thu, 3 Feb 2011 12:17:13 +0900 (JST) X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.4.0 Received: from T-ITOH1[10.124.101.86] by T-ITOH1 (FujitsuOutboundMailChecker v1.4.0/9992[10.124.101.86]); Thu, 03 Feb 2011 12:16:49 +0900 (JST) Message-ID: <4D4A1E09.10901@jp.fujitsu.com> Date: Thu, 03 Feb 2011 12:16:25 +0900 From: Tsutomu Itoh User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: Linux Btrfs CC: Chris Mason Subject: [PATCH] btrfs: cleanup error handling in btrfs_unlink_inode() Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 03 Feb 2011 03:17:30 +0000 (UTC) diff -urNp linux-2.6.38-rc3/fs/btrfs/inode.c linux-2.6.38-rc3.test/fs/btrfs/inode.c --- linux-2.6.38-rc3/fs/btrfs/inode.c 2011-02-01 12:05:49.000000000 +0900 +++ linux-2.6.38-rc3.test/fs/btrfs/inode.c 2011-02-03 11:25:47.000000000 +0900 @@ -2641,7 +2641,7 @@ int btrfs_unlink_inode(struct btrfs_tran path = btrfs_alloc_path(); if (!path) { ret = -ENOMEM; - goto err; + goto out; } path->leave_spinning = 1;