From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1546708-1519218925-2-15089992854197667916 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.001, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' 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=1519218924; b=P3/Rf/f1PN2pdMBDTEHF16IcSUJL+AXqUhjt7ZGXDHjBZ32 0BwAdR7HbNSzU2HsJfPAtuei/LhsVultvItaQJdmljx9hiWyHHClw2xnIVS7NCrP Nww0CnxG05EItdmQc5WQmv9Kf68FtblXHQlRyajsiu3VxVkO/OPOO5aWF3i5iGKk KyKtj8vORc4F+jV+aJUxL5gfoc2/y6nMY/vDNgBMPmxo0wJqdQTqeUZJ9lnQr4lS OlrO3A0w5DYbG87SOWgPxdMifIzatpYP93umNEkNP1lDj2f3hgAzVbx+NX3GGL+p pq78RjpYnZ2R6bYxs7/YxknxlxqGebHYncaXLBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1519218924; bh=uMUmJZgjlFe9Xpa/GZ8XILGuWW 6brjRNP+6JlSW3kdk=; b=N0W8Rw5VkP8gHlZR+0g2qv67YiscXsxCTWYUMmu5Ym ajmk0EsQU3Yaxtq6NTxVsCoGKPTIvX1cd9MfCqw3aufmlhQgWK2z0YIrTLqotPKb wiodKkHCk/HtQ1SJKab1T1md6lhmkkxkND7ckUrLa7WbM7cUCy2q84WiGrquJjxp bIk/vKXHEcIYNP5CWHmU0VDEyQcsSmnT1AvWoV6DAy7OedkJf9m2bfeleRdr2eUO VimCdxfvw1sotXL/tnpTHcyce0WZ56/hIwtTvM2OdUJOnzBC9NWmkF3lRWoK0EX/ Kec23N2/IZJ6p8IB58cd+BJeftr/ZItyFID4kKX5NGiw== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; 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=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; 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=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932542AbeBUNPJ (ORCPT ); Wed, 21 Feb 2018 08:15:09 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:46008 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753648AbeBUNNT (ORCPT ); Wed, 21 Feb 2018 08:13:19 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Bo , Josef Bacik , David Sterba Subject: [PATCH 4.15 135/163] Btrfs: fix deadlock in run_delalloc_nocow Date: Wed, 21 Feb 2018 13:49:24 +0100 Message-Id: <20180221124537.653207010@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124529.931834518@linuxfoundation.org> References: <20180221124529.931834518@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Liu Bo commit e89166990f11c3f21e1649d760dd35f9e410321c upstream. @cur_offset is not set back to what it should be (@cow_start) if btrfs_next_leaf() returns something wrong, and the range [cow_start, cur_offset) remains locked forever. cc: Signed-off-by: Liu Bo Reviewed-by: Josef Bacik Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/inode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1330,8 +1330,11 @@ next_slot: leaf = path->nodes[0]; if (path->slots[0] >= btrfs_header_nritems(leaf)) { ret = btrfs_next_leaf(root, path); - if (ret < 0) + if (ret < 0) { + if (cow_start != (u64)-1) + cur_offset = cow_start; goto error; + } if (ret > 0) break; leaf = path->nodes[0];