From patchwork Wed Feb 27 11:20:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 2192911 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DFB5FDF2F2 for ; Wed, 27 Feb 2013 11:21:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932241Ab3B0LVD (ORCPT ); Wed, 27 Feb 2013 06:21:03 -0500 Received: from mail-da0-f50.google.com ([209.85.210.50]:45340 "EHLO mail-da0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758614Ab3B0LVB (ORCPT ); Wed, 27 Feb 2013 06:21:01 -0500 Received: by mail-da0-f50.google.com with SMTP id h15so253005dan.9 for ; Wed, 27 Feb 2013 03:21:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=5WGAk89YLMvkpqUQtTcW1YxbNKoSyhjHaW6YI3aktkY=; b=dVljn7uDV7MMENkD/ZbMAoO1LiYebfSEa78yPKDJbz4OVeWETynEANKwP/nDSu5pQu xM39EVIPeG8Yvp+ypBXzpNEvPNqIbeKbzqHU+ZP/WUpIP2htd0Cit/t6ehISb84DkhvS UTwWKj6EqY7PDjj2aGK4CSc5czHFU3Q5hO2AMHxzkr31KsBAVZMLWDpagBziaiQd/XAC RD753lFqhwRkZq1Wlt04bnfR2qTFt4JOxJzZrSIxA8PvhoWNZk9qr3SgreV+tkXeuRzQ 0RXPqeqUWDHpwdUygsODz9TVfa5fVoU0HNWWJ851qSj9OfYP89y4UZCYk0AmBXY0vae7 4kVg== X-Received: by 10.68.129.41 with SMTP id nt9mr2868895pbb.20.1361964061085; Wed, 27 Feb 2013 03:21:01 -0800 (PST) Received: from localhost.localdomain ([112.23.170.203]) by mx.google.com with ESMTPS id pg6sm4380121pbb.0.2013.02.27.03.20.58 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 27 Feb 2013 03:21:00 -0800 (PST) From: Wang Shilong To: linux-btrfs@vger.kernel.org Cc: wangshilong1991@gmail.com, miaox@cn.fujitsu.com, sensille@gmx.net Subject: [PATCH 2/3] Btrfs: return ENOMEM rather than use BUG_ON when btrfs_alloc_path fails Date: Wed, 27 Feb 2013 19:20:56 +0800 Message-Id: <1361964056-2455-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.11.7 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Wang Shilong Return ENOMEM rather trigger BUG_ON, fix it. Signed-off-by: Wang Shilong Reviewed-by: Miao Xie Reviewed-by: Zach Brown --- fs/btrfs/qgroup.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index f011d9b..69fa487 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -620,7 +620,9 @@ static int update_qgroup_limit_item(struct btrfs_trans_handle *trans, key.offset = qgroupid; path = btrfs_alloc_path(); - BUG_ON(!path); + if (!path) + return -ENOMEM; + ret = btrfs_search_slot(trans, root, &key, path, 0, 1); if (ret > 0) ret = -ENOENT; @@ -661,7 +663,9 @@ static int update_qgroup_info_item(struct btrfs_trans_handle *trans, key.offset = qgroup->qgroupid; path = btrfs_alloc_path(); - BUG_ON(!path); + if (!path) + return -ENOMEM; + ret = btrfs_search_slot(trans, root, &key, path, 0, 1); if (ret > 0) ret = -ENOENT; @@ -702,7 +706,9 @@ static int update_qgroup_status_item(struct btrfs_trans_handle *trans, key.offset = 0; path = btrfs_alloc_path(); - BUG_ON(!path); + if (!path) + return -ENOMEM; + ret = btrfs_search_slot(trans, root, &key, path, 0, 1); if (ret > 0) ret = -ENOENT;