From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-935517-1516770450-2-4449727531771695456 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enfrca, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516770449; b=OjcG7d/HYiNqomH2LF7Tc5W3wMatdchd9Au5ekN8w+QAV6s m0vI+2gojIzGgeyUDkcCYYHQEZ6dd5pOXjZXo5YZWiWjYzEyXophAnq9qCcd9JCf pZse+zGhzsLWMu0Myt2SKgDIF2TjVZiPnmBa0CrBAmaBvm6qvLBjr/I4/Pu0pCtA B30JTpMKsQ82C2etoQxVppP6lcDm6a6QgViW9ULDTK+kmcrvOHRlhO16emKJcy3N 6xo7olAm1vm6m3G0BHsmI9oaiRgQ0hVi+nI4G41a+R+n68n8qYallJTCnvFY6wI9 OPHh2uQpXeXaTUMOx5rq/r9BWrs3iZpSGCtRfXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516770449; bh=GH0eJt uYNh+cRUy6Nj1OdmlTQ8UTPgM/WJcKtynxWBU=; b=aWgTAdk2fwJLi8F+LpANH7 N9sNr+95kzkejp3F6zqBLoNHPGUEIlyXoyVaaKzS7gHjaISzlLP//SYucTma77jw VwjH9O0wL0SOWP0DIj/wg/ROUaWjUHBgZPzgcbKJaPiKojbF/8SXh+NfTWT3Kp7x RYa6SEn5vLwE3W/gDx53caAyctGb9XdvVw8Z62yaXwLRB0jhVTd4MnJl35zXakRC dJ2EECc87p+rL3b7gHZXvOIJbbhKxc5qwm9/7PrVy40+4n0rU3M2NZqH3S4muQqr rbLfwuXwEDGIz7BaP2U6tGIqtx3QMxdSbtIHq5R8tS2eBD1hEK6eefVjiWG9Y5/g == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=eZ1pui37 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=eZ1pui37 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752324AbeAXEOZ (ORCPT ); Tue, 23 Jan 2018 23:14:25 -0500 Received: from mail-cys01nam02on0106.outbound.protection.outlook.com ([104.47.37.106]:53792 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752172AbeAXEOY (ORCPT ); Tue, 23 Jan 2018 23:14:24 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Nikolay Borisov , David Sterba , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 002/100] btrfs: Fix transaction abort during failure in btrfs_rm_dev_item Thread-Topic: [PATCH AUTOSEL for 4.14 002/100] btrfs: Fix transaction abort during failure in btrfs_rm_dev_item Thread-Index: AQHTlMnPDRNW3BZvnU6OWGKEGvxPxw== Date: Wed, 24 Jan 2018 04:14:21 +0000 Message-ID: <20180124041414.32065-2-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0920;6:H+hdvhoe1ILUG0R4SfrinKS0KuckofCHp4SGm7UkgHub809M62uTQ3CifgYUwtzcNlRmIp9WXtyw/GrMN7QpqrPiS3E2m1yhV4wEpnbHPYl60c4RDGSwuKsk5RLSuRjxCEsKQEGIcYUtH53xXzdQoA5TCSptZ219NwqV4sjoT3gX77z5lkCpxgScvfF/4hUSOl0JVBoWeRvaA0eVG8uReJ9L5puRKBuJ4K9Zrx1HJoxrMToC/bVrbAebfFFpPG8jrGH0dFNCJRbGqGP9FHUMIcuGZbsHSNnx2EBEIFdLQPFUjqT73lMK3YaEZIfRMw/2ylAbp6LNm/E85IfHZ8ltDqHrl4iAKQ+wXHg2uBmod0rJtRghazPoTv81oXr9c78K;5:L/+lcFygVIXWoZZu3jHTyWlbbbsnW7xlinak7bR4JYoyR8ZgeNcMM7tsUrSpp2ceADfxu1+34vnYd5vitGDiQ1I/txT3sqxGPu/3vuJ7dHIxDs6jpsb1FSrMizkWLNMHDEnGc4HOlbDMh+YCVrZNQHXvNt+0ijAN7OyAo3vQneM=;24:7JRa17gwTj4sqmlu0Yf4JPL8RviseZbELOW0FDau9kmqTK8UKTARZGU5qKGLjEovv4F6ILM2rBiUxtolXrK86k3Ex4ZGYtyziWYLCXG9k5Q=;7:BJgyQQyMks3MivJHy6up5nFlYY60NAFlXWcvJo1wpbAs/zjVuJTAr5ZJZUAsoRV1EOVxc5U0QH6/y+PaUHBS9oRF7moLZ5FljPJce+9qLfDeo+UxrDBmRbhYkqMC9mxKbK5lNWG5cOLRz6OdoTvqft74BW4yU6wAPdlQst+7ICt94RHSX1OCSLnFbx3hPlUpwwDmmkG5XAaUMHMTCRUlf1oMvRLh1uVOSWyI/Xl5FVawq9w8ancuWRoVZHfR7A9B x-ms-exchange-antispam-srfa-diagnostics: SSOS;SSOR; x-ms-office365-filtering-correlation-id: 35ba452f-d6f5-4097-fbb5-08d562e0f238 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB0920; x-ms-traffictypediagnostic: DM5PR2101MB0920: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3231046)(2400081)(944501161)(93006095)(93001095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0920;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0920; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(366004)(376002)(396003)(39380400002)(346002)(189003)(199004)(105586002)(106356001)(551934003)(86362001)(2900100001)(66066001)(305945005)(14454004)(22452003)(72206003)(3280700002)(3660700001)(10290500003)(5660300001)(36756003)(2950100002)(7736002)(478600001)(110136005)(316002)(97736004)(81166006)(6116002)(3846002)(26005)(1076002)(6346003)(54906003)(25786009)(81156014)(6436002)(10090500001)(68736007)(107886003)(99286004)(8676002)(8936002)(4326008)(5250100002)(2501003)(86612001)(6486002)(2906002)(6506007)(76176011)(6512007)(102836004)(53936002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0920;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 5TOjMTZahi4HmYdXNgjmH2BFZPZGXLLof8L9izV5ywT62rQdpOVstlMoJOe8HvI/0L8IYVSVAoZdOTf9MSnCUw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35ba452f-d6f5-4097-fbb5-08d562e0f238 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:21.6999 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0920 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Nikolay Borisov [ Upstream commit 5e9f2ad5b2904a7e81df6d9a3dbef29478952eac ] btrfs_rm_dev_item calls several function under an active transaction, however it fails to abort it if an error happens. Fix this by adding explicit btrfs_abort_transaction/btrfs_end_transaction calls. Signed-off-by: Nikolay Borisov Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/volumes.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 0c11121a8ace..4006b2a1233d 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1765,20 +1765,24 @@ static int btrfs_rm_dev_item(struct btrfs_fs_info *= fs_info, key.offset =3D device->devid; =20 ret =3D btrfs_search_slot(trans, root, &key, path, -1, 1); - if (ret < 0) - goto out; - - if (ret > 0) { - ret =3D -ENOENT; + if (ret) { + if (ret > 0) + ret =3D -ENOENT; + btrfs_abort_transaction(trans, ret); + btrfs_end_transaction(trans); goto out; } =20 ret =3D btrfs_del_item(trans, root, path); - if (ret) - goto out; + if (ret) { + btrfs_abort_transaction(trans, ret); + btrfs_end_transaction(trans); + } + out: btrfs_free_path(path); - btrfs_commit_transaction(trans); + if (!ret) + ret =3D btrfs_commit_transaction(trans); return ret; } =20 --=20 2.11.0