From patchwork Mon Jul 29 22:27:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 2835166 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B40E39F4D4 for ; Mon, 29 Jul 2013 22:28:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D307520350 for ; Mon, 29 Jul 2013 22:28:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E28C02034F for ; Mon, 29 Jul 2013 22:28:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671Ab3G2W2E (ORCPT ); Mon, 29 Jul 2013 18:28:04 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:36980 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754239Ab3G2W2D (ORCPT ); Mon, 29 Jul 2013 18:28:03 -0400 Received: by mail-wg0-f47.google.com with SMTP id j13so5314512wgh.2 for ; Mon, 29 Jul 2013 15:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=prnSw+58TuOeslecHqnheqwh+a0+f1NceCIut6ygVoo=; b=w0sZjRZ8iM4P29wdkqeMlx6i/wbYIzENgPU5CKlFhqiBilRLo8MW37jCwCJS3fcjGB DLaUL0OoU/+9e7pelJoPkNxf29/x7u1lJ3AMeBAMbF9X3CkldL4DiZaVm1rwETFpIs2x UUA9utoUWauD8g9eKx+4xqOarP5jUaEqkZhJK13toREvbF434qY6NCeKKC4oaBiywC6E /Al5405xnnHrHpjo3cIs5XUYZXN9qvUX3gvhkCTYRQzWrfPEjebSb7qY59UyOn5dPqNN ASXeIuptxllGjxiK8avSk7vN/SLhUbz60H6ZPMrXriJNBTwl26c+WAzcQz7vAvW461tW bPcQ== X-Received: by 10.180.20.105 with SMTP id m9mr3836126wie.44.1375136881437; Mon, 29 Jul 2013 15:28:01 -0700 (PDT) Received: from storm-desktop.lan (bl9-171-157.dsl.telepac.pt. [85.242.171.157]) by mx.google.com with ESMTPSA id a6sm25383472wib.10.2013.07.29.15.28.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Jul 2013 15:28:00 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH v2] Btrfs-progs: add missing path alloc return value check Date: Mon, 29 Jul 2013 23:27:53 +0100 Message-Id: <1375136873-11384-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1374216370-18953-1-git-send-email-fdmanana@gmail.com> References: <1374216370-18953-1-git-send-email-fdmanana@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Also remove unused path in extent-tree.c:finish_current_insert(). Signed-off-by: Filipe David Borba Manana --- V2: added 1 more path alloc check and removed unnecessary path allocation in extent-tree.c:finish_current_insert(). extent-tree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extent-tree.c b/extent-tree.c index f597e16..e4adaa3 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1487,6 +1487,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, } path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; path->reada = 1; key.objectid = bytenr; @@ -1577,6 +1579,8 @@ int btrfs_set_block_flags(struct btrfs_trans_handle *trans, BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA); path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; path->reada = 1; key.objectid = bytenr; @@ -2078,7 +2082,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, u64 end; u64 priv; struct btrfs_fs_info *info = extent_root->fs_info; - struct btrfs_path *path; struct pending_extent_op *extent_op; struct btrfs_key key; int ret; @@ -2086,8 +2089,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, btrfs_fs_incompat(extent_root->fs_info, BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA); - path = btrfs_alloc_path(); - while(1) { ret = find_first_extent_bit(&info->extent_ins, 0, &start, &end, EXTENT_LOCKED); @@ -2121,7 +2122,6 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, GFP_NOFS); kfree(extent_op); } - btrfs_free_path(path); return 0; }