From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1483324-1517681671-2-4573654839290807663 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 unknown, 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=1517681671; b=PKgJzl28RiHiUoJ+j4Ob+1Ia1TK+BcMESCsmU0IH8/kk/Gy WbI4P3MzbtKgQHYjb5KRMy9eQoo93MK8cwKQGNIgKyaxHud5yauvEo4IjQ5kgdRH HtW+t/wU2eKrn8JBlrIxoEMUINS7csr+aR1tlLfaxzdftKD3MJtoCy597Q6TMTj2 FP5lr3BWSpsKM4NsOIXYLKrWxi+6y2Qvkd1jTocWjVQyptahEUlvZD4Uk3KumdGJ KN2XTg/f2Tn2rcoPA1ZiO+8diJ8Av9G8pP+sOJVo4OeLn68zRPl1pdu/ocfCXbn2 PKQFAfetDkbbVBaMP20WlW0QjbIZeW7Tffck7FQ== 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=1517681671; bh=l/gEiW WaybexegXFVGFc12H2aT8GF2toVXMHWTDLOJs=; b=rTZ0eC/zCpBHC0oxJ1sQun +o+RhuyyeHPal+ZzAhk/Lh88wQErht+WPiH2jLb90DRhKsJSDWHsCZ8GDbUHlvN6 JVSGkidkrJvt56SlSO44lxj12oWQeByQ0CzSe0NHAs2QHQvysl9Vo29o26tkwVOG yuT32zrBl2ahbku5zjoMk/KPQ0B22a5lFWx5H6avdHse15Klh6N3heIF5FtJ/r6t CUT6rl2744/j0ZJjFUCAQRiDN+qFjkAJCyzFLHZV6hlFaNx4ITcn6BQ07QOxwCAW OjtbwtN+if8Aie0ai3tucSgnKAPkhKmPb1CLeufCr7YB4bKRA69FWbPm21Sd0Xsw == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=U/qyZC4A 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: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=U/qyZC4A 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 S1753906AbeBCSOZ (ORCPT ); Sat, 3 Feb 2018 13:14:25 -0500 Received: from mail-bl2nam02on0091.outbound.protection.outlook.com ([104.47.38.91]:45338 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752969AbeBCSHY (ORCPT ); Sat, 3 Feb 2018 13:07:24 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Aliaksei Karaliou , "Darrick J . Wong" , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 14/24] xfs: quota: check result of register_shrinker() Thread-Topic: [PATCH AUTOSEL for 3.18 14/24] xfs: quota: check result of register_shrinker() Thread-Index: AQHTnRmFODVNlrcRi0qT9oib0e8MMQ== Date: Sat, 3 Feb 2018 18:05:05 +0000 Message-ID: <20180203180444.10801-14-alexander.levin@microsoft.com> References: <20180203180444.10801-1-alexander.levin@microsoft.com> In-Reply-To: <20180203180444.10801-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;BL0PR2101MB0993;7:JPVo6Ktfo9UJOPmEq5CAG2vgbJQvQjOs9yXsD2TrYLq7w/rW2OzMRYs33t6QF9dPqyJ2/lvBKPm/PIZt5Ck6/WyW2eOLMROSucGH8ZGoviBv47pmrOpAG1QCi6RKHIuv1LUAPAMi4RgURV7lqB2KksMQc84fYFlz7kPjsmutC3+6PjxEQp+Yi/bgzA21alGnXy2wahSRFZvhwNV2PXaKcOJy/qlgyz5zFjejFdaf47zXe0aQFjCrsGMiunH+cPmb x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: ffb39425-9b2d-4951-910b-08d56b30e0d8 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:BL0PR2101MB0993; x-ms-traffictypediagnostic: BL0PR2101MB0993: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231101)(2400082)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:BL0PR2101MB0993;BCL:0;PCL:0;RULEID:;SRVR:BL0PR2101MB0993; x-forefront-prvs: 05724A8921 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39380400002)(39860400002)(376002)(366004)(396003)(189003)(199004)(6436002)(186003)(3660700001)(8936002)(105586002)(2906002)(6346003)(6116002)(3280700002)(3846002)(97736004)(6486002)(1076002)(2950100002)(6666003)(81156014)(86362001)(575784001)(76176011)(102836004)(2501003)(5250100002)(26005)(68736007)(10090500001)(81166006)(8676002)(15650500001)(59450400001)(53936002)(5660300001)(22452003)(305945005)(107886003)(7736002)(4326008)(86612001)(36756003)(99286004)(316002)(6512007)(10290500003)(72206003)(6506007)(14454004)(478600001)(25786009)(106356001)(2900100001)(39060400002)(54906003)(110136005)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:BL0PR2101MB0993;H:BL0PR2101MB1027.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: wVeuwdJyKerNa0iOozguwWrqNl9gSeJGoKRrfH/zCFxvkx8xWnhM8h58SLbLeARyYNb6Kvxhzx+6zgih71y7JQ== 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: ffb39425-9b2d-4951-910b-08d56b30e0d8 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Feb 2018 18:05:05.6590 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR2101MB0993 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: Aliaksei Karaliou [ Upstream commit 3a3882ff26fbdbaf5f7e13f6a0bccfbf7121041d ] xfs_qm_init_quotainfo() does not check result of register_shrinker() which was tagged as __must_check recently, reported by sparse. Signed-off-by: Aliaksei Karaliou [darrick: move xfs_qm_destroy_quotainos nearer xfs_qm_init_quotainos] Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Sasha Levin --- fs/xfs/xfs_qm.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 30eea71405ce..b11a9c93e780 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -49,7 +49,7 @@ STATIC int xfs_qm_init_quotainos(xfs_mount_t *); STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); =20 - +STATIC void xfs_qm_destroy_quotainos(xfs_quotainfo_t *qi); STATIC void xfs_qm_dqfree_one(struct xfs_dquot *dqp); /* * We use the batch lookup interface to iterate over the dquots as it @@ -662,9 +662,17 @@ xfs_qm_init_quotainfo( qinf->qi_shrinker.scan_objects =3D xfs_qm_shrink_scan; qinf->qi_shrinker.seeks =3D DEFAULT_SEEKS; qinf->qi_shrinker.flags =3D SHRINKER_NUMA_AWARE; - register_shrinker(&qinf->qi_shrinker); + + error =3D register_shrinker(&qinf->qi_shrinker); + if (error) + goto out_free_inos; + return 0; =20 +out_free_inos: + mutex_destroy(&qinf->qi_quotaofflock); + mutex_destroy(&qinf->qi_tree_lock); + xfs_qm_destroy_quotainos(qinf); out_free_lru: list_lru_destroy(&qinf->qi_lru); out_free_qinf: @@ -673,7 +681,6 @@ out_free_qinf: return error; } =20 - /* * Gets called when unmounting a filesystem or when all quotas get * turned off. @@ -690,19 +697,7 @@ xfs_qm_destroy_quotainfo( =20 unregister_shrinker(&qi->qi_shrinker); list_lru_destroy(&qi->qi_lru); - - if (qi->qi_uquotaip) { - IRELE(qi->qi_uquotaip); - qi->qi_uquotaip =3D NULL; /* paranoia */ - } - if (qi->qi_gquotaip) { - IRELE(qi->qi_gquotaip); - qi->qi_gquotaip =3D NULL; - } - if (qi->qi_pquotaip) { - IRELE(qi->qi_pquotaip); - qi->qi_pquotaip =3D NULL; - } + xfs_qm_destroy_quotainos(qi); mutex_destroy(&qi->qi_tree_lock); mutex_destroy(&qi->qi_quotaofflock); kmem_free(qi); @@ -1574,6 +1569,24 @@ error_rele: } =20 STATIC void +xfs_qm_destroy_quotainos( + xfs_quotainfo_t *qi) +{ + if (qi->qi_uquotaip) { + IRELE(qi->qi_uquotaip); + qi->qi_uquotaip =3D NULL; /* paranoia */ + } + if (qi->qi_gquotaip) { + IRELE(qi->qi_gquotaip); + qi->qi_gquotaip =3D NULL; + } + if (qi->qi_pquotaip) { + IRELE(qi->qi_pquotaip); + qi->qi_pquotaip =3D NULL; + } +} + +STATIC void xfs_qm_dqfree_one( struct xfs_dquot *dqp) { --=20 2.11.0