From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517180672-2-3321547687738100796 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, 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='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=1517180671; b=XnLO/JAutyAiNUkn8HcX5SMWLsfRAPcPbz1nnER/apm6kcF Ag1mdM0i++M68dPTxo1t3vjZVn3rSLHe+Hes8eeJCZtMWUG1VNMyXG72W2pb2t+E +S4xSf+4sCuheKY0zrl0NuxyyjWmeM0rj58S8PHUkytW119Rt2MWV4WoIsXU/1sL o1yZ+t95f6k1gbKuV72hVUKlxHeYtFlEYnMVngsn5v01WzMFYu0ncOgWirptcYyl uo7qLN/JVSNt3EbsvpG0NdSoHSJd3GWUYQoPMYoFTax5wnAYowqigM4AvlQy567+ a1cztcSQ3EV4ImqgY+fwQ7aHh6LvTlnbSv5I0DA== 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=1517180671; bh=OMQ2Hh 1arrQRJGC4KIxIW5j3RICw+TrS8cv49Tj7wSw=; b=ft0AbGev/vLdy4FZiykRFd LU+81lTAGbr9nPlIUpfX4EYebSEI6QlOEOi3lAtpQqyEXkhbacTB66dn+7C48m7P ReTmLnK6qoYVUhB+U77pW/Zw3AzFTnCAdxI5cvVe1BhFlyM18o4R7zDt31YwBbXA MiAjCdPq75WrS6F2BU9ioi8iKpEv3JSpsaqgCJaUhKAnzKZV84Ld8c4HriT747hs 3/M3torJSNEQ8fd8ez+SvqWrE5F1d6ZLvENwGP27TG5kUT6K2uBnbnGD0H3wkvLR d477wEIx8iXTSLHIYfWzQWH7ZtGWAZ7n3ng2GMctWr+WGUseHi4ted5Z8GNgQmYA == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ALmNpxI9 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: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ALmNpxI9 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 S1753461AbeA1W1j (ORCPT ); Sun, 28 Jan 2018 17:27:39 -0500 Received: from mail-by2nam03on0134.outbound.protection.outlook.com ([104.47.42.134]:46538 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752064AbeA1W1f (ORCPT ); Sun, 28 Jan 2018 17:27:35 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Justin Maggard , Justin Maggard , David Sterba , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 062/100] btrfs: Fix quota reservation leak on preallocated files Thread-Topic: [PATCH AUTOSEL for 4.14 062/100] btrfs: Fix quota reservation leak on preallocated files Thread-Index: AQHTmIcQmqzlwcFN3EOmRLeinESlmw== Date: Sun, 28 Jan 2018 22:26:39 +0000 Message-ID: <20180128222547.7398-62-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-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;MW2PR2101MB1034;6:9WBhX971VSQUx3HZaY2ysN/qe63VCCUBSTY1A5m7YHWjcLelBX7LQAaem24vbtamoZlrjJrD8g0BxUphWYdMxYC6DSorqT1oFJr8p6CZEnBcTrg7oKvVqFSeTY5ule2+aRiIEP54co2PPEnrnobTkPC9FRZwYOF4I8tcEVx9th7XrcqO9VExoAxf0Od2mP8I9RTNxz8Yqv4c6OfzCb4S0K+vRuwBdYl9SPuM71ReN6I5sXNaaMZZDqhTqwa9fk97wtnlUKyS1hgd8DuT8xA5ajzVBQc4XaGX3eWnDCudUAa5HpPaTB26SYR9DRJWWZ35mOi5wpR47zh2IZDy/XKJjwe3VN6ykcSHzBWny+pz+K249IAz3O9I67bffrJf76G3;5:jlH1oYAN6fM0VNgpBIFAfYBeTZ1mPK309F/ugD+sIaVMLnmVu0yD3aerwzEdcyuF+eLs7xtFVG5Cg6WUNyvnIR4l/Kri9I0y3mTXj/5khXRAcrc8rUfiWpzLY/S3Pm89BWLXBF+OxeLeOhciS5c6TyRqYYeipmSjk9D6uwfWExQ=;24:LpbLYWuRR40bUWjkwOAOXTr1ykg6icdKCXd/11GKUvjsG+1fsfotbTv2euZJdb2ImwyZjRYUwwWzZicbgT1XsvnHaepDUikUlvhVqAMFyuM=;7:lMnTnpxDEw0jeFsU5JU4ZtmOKPPt5kAQ36PDW1tEuT+4iRruI04d295H1NBuSmucCZ2L5F1mGGXjOiJgw6gNhT3UdYAtwIyOhRAblSWGNRQqDhU8h7qroe0YVpxGyzgwYWV1PqnCAhNRLHrhT8hGfU+D0Jr/gEl6T44Ba7Q+LLtj2cf35WByilDTqsP/XGywngA0235FIzYaIXQtNJ3MS5nz9LoarQHOaSjgeMAZGhjOKd3m6w1P71Wp5qi4VO8J x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 3810199a-1967-43a4-65d7-08d5669e53a1 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(69716599282095); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(2950100002)(26005)(1076002)(66066001)(6116002)(5660300001)(3846002)(186003)(316002)(22452003)(54906003)(110136005)(86612001)(36756003)(6486002)(86362001)(53936002)(6436002)(6512007)(106356001)(8676002)(105586002)(305945005)(7736002)(39060400002)(68736007)(478600001)(81166006)(59450400001)(102836004)(76176011)(6506007)(72206003)(10290500003)(14454004)(2900100001)(3660700001)(99286004)(97736004)(81156014)(25786009)(8936002)(4326008)(5250100002)(3280700002)(2501003)(15650500001)(10090500001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: KoJ0CnADIhdzEvV7fLZSblKyvAL1Ky10+tuUIHc6hskk0QMPBQ6mMtv6Ph8enqTLGCocGgXU4g4qvGu3k+SO9A== 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: 3810199a-1967-43a4-65d7-08d5669e53a1 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:39.6600 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 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: Justin Maggard [ Upstream commit b430b7751286b3acff2d324553c8cec4f1e87764 ] Commit c6887cd11149 ("Btrfs: don't do nocow check unless we have to") changed the behavior of __btrfs_buffered_write() so that it first tries to get a data space reservation, and then skips the relatively expensive nocow check if the reservation succeeded. If we have quotas enabled, the data space reservation also includes a quota reservation. But in the rewrite case, the space has already been accounted for in qgroups. So btrfs_check_data_free_space() increases the quota reservation, but it never gets decreased when the data actually gets written and overwrites the pre-existing data. So we're left with both the qgroup and qgroup reservation accounting for the same space. This commit adds the missing btrfs_qgroup_free_data() call in the case of BTRFS_ORDERED_PREALLOC extents. Fixes: c6887cd11149 ("Btrfs: don't do nocow check unless we have to") Signed-off-by: Justin Maggard Reviewed-by: Qu Wenruo Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/inode.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index d94e3f68b9b1..d7881ccf5310 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3006,6 +3006,8 @@ static int btrfs_finish_ordered_io(struct btrfs_order= ed_extent *ordered_extent) compress_type =3D ordered_extent->compress_type; if (test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) { BUG_ON(compress_type); + btrfs_qgroup_free_data(inode, NULL, ordered_extent->file_offset, + ordered_extent->len); ret =3D btrfs_mark_extent_written(trans, BTRFS_I(inode), ordered_extent->file_offset, ordered_extent->file_offset + --=20 2.11.0