From patchwork Thu Mar 25 12:37:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 88222 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2PCbSxl032362 for ; Thu, 25 Mar 2010 12:37:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752817Ab0CYMh1 (ORCPT ); Thu, 25 Mar 2010 08:37:27 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:63961 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752017Ab0CYMh1 (ORCPT ); Thu, 25 Mar 2010 08:37:27 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 5ADF1170028; Thu, 25 Mar 2010 20:37:26 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o2PCa6Cq006079; Thu, 25 Mar 2010 20:36:06 +0800 Received: from [127.0.0.1] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 1F255DC224; Thu, 25 Mar 2010 20:39:52 +0800 (CST) Message-ID: <4BAB5916.2030206@cn.fujitsu.com> Date: Thu, 25 Mar 2010 20:37:42 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.8) Gecko/20100227 Thunderbird/3.0.3 MIME-Version: 1.0 To: Chris Mason CC: Linux Btrfs Subject: [PATCH 17/18] btrfs: add NULL check for build_backref_tree() 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.3 (demeter.kernel.org [140.211.167.41]); Thu, 25 Mar 2010 12:37:28 +0000 (UTC) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 0b23942..6737803 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -816,8 +816,10 @@ next: list_add_tail(&edge->list[UPPER], &list); } out: - btrfs_free_path(path1); - btrfs_free_path(path2); + if (path1) + btrfs_free_path(path1); + if (path2) + btrfs_free_path(path2); if (err) { INIT_LIST_HEAD(&list); upper = node;