From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516769625-2-8514988733479455534 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 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=1516769624; b=unn9Gkf+n207IVKY/fEcQBK5NqS+8wO3wmSXkjkWcIFAybl BjvQIlvgoy46e7r5isI5GiiTYnlvMTuAHkp9jm0Tlfc8Binqs9FhgTWeYlp5VCfA rTcHFGSzRx+mPEkJ3u4tu3fgBEjjarytoKrwsiQvCd4bVbtzk+lkrYCcyUJRroz9 mfeJZUYlGsdUA3jhWWrny/12dOe+eyah2LCsGufU9BayOdMsk+8c4gZx68AN2syS qsXwchMyD5eZOBJkVU4kc4YMFaHt8850+G7yLxXKPemRNixp4kxv8n+VKQnoDf23 j+OIUWdz9itUg2uCFfttmKweZr8LJVXOOUqPc1w== 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=1516769624; bh=HNF3J4 XXcnYnf9dtsmtMOGF7iPjhAZjS8BUvIuMYPtQ=; b=aQyvvJU29lnhkxosQgbkMw Kx+vdI1zcJkdDioFTBgejaTV+NwvpGdGGyQ2MemzBa/d5TWjGLm0Ri60JiF6lzEz XUegtOAk6sAkal+Qwm22qlwZiRXdi05MYcq0UyNNAANltuVo6hv3r7URXBa/kUwQ AmnP0Lu1z+XSFm7fDY8mwCBn6+NNH/u7zshDWNiFZOhePc+ss1YcHDuRNLQAFx08 Eo9CyAwfcqLeMwG4/J8qcIz9HccE36a0kVN4Yx//sYicd6/VqwvgC6qM5MPfBmsz 4E3KU25+fSsD7PeGWC/Ec5haRBBeLOPnbKkvjzAF9/Hm/03Ve0WAL6lSQsewUp5g == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=hw6ELa2b 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: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=hw6ELa2b 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 S932433AbeAXExN (ORCPT ); Tue, 23 Jan 2018 23:53:13 -0500 Received: from mail-sn1nam01on0105.outbound.protection.outlook.com ([104.47.32.105]:55328 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932432AbeAXEP6 (ORCPT ); Tue, 23 Jan 2018 23:15:58 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Chao Yu , Jan Kara , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 064/100] quota: propagate error from __dquot_initialize Thread-Topic: [PATCH AUTOSEL for 4.14 064/100] quota: propagate error from __dquot_initialize Thread-Index: AQHTlMnkFl762ML+VEO045cTX/jwAA== Date: Wed, 24 Jan 2018 04:14:57 +0000 Message-ID: <20180124041414.32065-64-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;DM5PR2101MB1015;7:FDL+wHB7C4VJOL9TGgcbxlCdIgikAmOn2YSNUKlIWTgzA+r6BQn23/LWokeDaq3k/0W16LEc8kzcyLiq6932h7jGefUPNf6aOvj0BVyO8x655b/PnWOdSuwZrBbGP63f1w4CZB5Pqgoaz0R7ulspfC6s+GKV/Blqu+L/AJmnx9vTfmNdWC5lDehfuelsmL0/nnA8zT8rkW/V7T0r4EP3ht7Qe4fBCzCP88HpBsGIsAzHqC0i+fCEYGp60mVvCaeH x-ms-office365-filtering-correlation-id: 48722ad2-0171-429c-a5ae-08d562e1294c 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:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(50582790962513); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1015;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1015; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(376002)(366004)(39860400002)(346002)(199004)(189003)(478600001)(106356001)(6512007)(53936002)(2900100001)(15650500001)(36756003)(102836004)(2950100002)(2501003)(10290500003)(97736004)(14454004)(81166006)(72206003)(8936002)(6486002)(1076002)(10090500001)(6346003)(26005)(54906003)(4326008)(575784001)(76176011)(99286004)(86362001)(3660700001)(105586002)(6116002)(8676002)(68736007)(22452003)(66066001)(25786009)(6506007)(5660300001)(305945005)(59450400001)(7736002)(3280700002)(5250100002)(2906002)(107886003)(86612001)(6436002)(316002)(81156014)(3846002)(110136005)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1015;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: QLAY+rtGBs0l3Y5J6HhxyMIcGkwljZRbPRgXR1gF0mzEK7WI9boeNuBF373R7VrpZ7qeHog0RjBvPdWcOECHVg== 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: 48722ad2-0171-429c-a5ae-08d562e1294c X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:57.5163 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 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: Chao Yu [ Upstream commit 1a6152d36dee08da2be2a3030dceb45ef680460a ] In commit 6184fc0b8dd7 ("quota: Propagate error from ->acquire_dquot()"), we have propagated error from __dquot_initialize to caller, but we forgot to handle such error in add_dquot_ref(), so, currently, during quota accounting information initialization flow, if we failed for some of inodes, we just ignore such error, and do account for others, which is not a good implementation. In this patch, we choose to let user be aware of such error, so after turning on quota successfully, we can make sure all inodes disk usage can be accounted, which will be more reasonable. Suggested-by: Jan Kara Signed-off-by: Chao Yu Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/quota/dquot.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 9f78b5015f2e..8406be97a518 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -934,12 +934,13 @@ static int dqinit_needed(struct inode *inode, int typ= e) } =20 /* This routine is guarded by s_umount semaphore */ -static void add_dquot_ref(struct super_block *sb, int type) +static int add_dquot_ref(struct super_block *sb, int type) { struct inode *inode, *old_inode =3D NULL; #ifdef CONFIG_QUOTA_DEBUG int reserved =3D 0; #endif + int err =3D 0; =20 spin_lock(&sb->s_inode_list_lock); list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { @@ -959,7 +960,11 @@ static void add_dquot_ref(struct super_block *sb, int = type) reserved =3D 1; #endif iput(old_inode); - __dquot_initialize(inode, type); + err =3D __dquot_initialize(inode, type); + if (err) { + iput(inode); + goto out; + } =20 /* * We hold a reference to 'inode' so it couldn't have been @@ -974,7 +979,7 @@ static void add_dquot_ref(struct super_block *sb, int t= ype) } spin_unlock(&sb->s_inode_list_lock); iput(old_inode); - +out: #ifdef CONFIG_QUOTA_DEBUG if (reserved) { quota_error(sb, "Writes happened before quota was turned on " @@ -982,6 +987,7 @@ static void add_dquot_ref(struct super_block *sb, int t= ype) "Please run quotacheck(8)"); } #endif + return err; } =20 /* @@ -2372,10 +2378,11 @@ static int vfs_load_quota_inode(struct inode *inode= , int type, int format_id, dqopt->flags |=3D dquot_state_flag(flags, type); spin_unlock(&dq_state_lock); =20 - add_dquot_ref(sb, type); - - return 0; + error =3D add_dquot_ref(sb, type); + if (error) + dquot_disable(sb, type, flags); =20 + return error; out_file_init: dqopt->files[type] =3D NULL; iput(inode); --=20 2.11.0