From patchwork Wed Sep 23 19:00:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 7251951 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9C5D1BEEC1 for ; Wed, 23 Sep 2015 19:00:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B711420695 for ; Wed, 23 Sep 2015 19:00:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD83B2064C for ; Wed, 23 Sep 2015 19:00:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753007AbbIWTAo (ORCPT ); Wed, 23 Sep 2015 15:00:44 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:59311 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751988AbbIWTAn (ORCPT ); Wed, 23 Sep 2015 15:00:43 -0400 Received: from pps.filterd (m0044008 [127.0.0.1]) by mx0a-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id t8NJ0g5D029571 for ; Wed, 23 Sep 2015 12:00:42 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=yQLnrdpQWFs3Q/OWuYyb6TfGAG49dW0Oy4EEZaPKyGU=; b=p7b/gzSO+v3Ki97BaqbYm1FB/MbxQZMlVFj7o1Ff7Q2A5KBClJ6BOkv1n6oTltd6MiKV muQfYuNADgtrkkv3sCiH3ZEMFnOWvINcu26fLMA4N1y19ifFHD0BWSH9SXKkXEd0SbQN /7hZFgY8Pu3NVmpCneb7gQ/vCexqfa95to0= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 1x41trr0e6-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Wed, 23 Sep 2015 12:00:42 -0700 Received: from localhost (192.168.54.13) by mail.TheFacebook.com (192.168.16.18) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 23 Sep 2015 12:00:39 -0700 From: Josef Bacik To: , Subject: [PATCH V2] Btrfs: end transaction if we abort when creating qgroup root Date: Wed, 23 Sep 2015 15:00:37 -0400 Message-ID: <1443034837-1723-1-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1443034603-5542-1-git-send-email-jbacik@fb.com> References: <1443034603-5542-1-git-send-email-jbacik@fb.com> MIME-Version: 1.0 X-Originating-IP: [192.168.54.13] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151, 1.0.33, 0.0.0000 definitions=2015-09-23_08:2015-09-23, 2015-09-23, 1970-01-01 signatures=0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 We still need to call btrfs_end_transaction if we call btrfs_abort_transaction, otherwise we hang and make me super grumpy. Thanks, Signed-off-by: Josef Bacik --- V1->V2: should have compiled before I hit send. fs/btrfs/volumes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index fbe7c10..ff64689 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4028,6 +4028,7 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info) if (IS_ERR(uuid_root)) { ret = PTR_ERR(uuid_root); btrfs_abort_transaction(trans, tree_root, ret); + btrfs_end_transaction(trans, tree_root); return ret; }