From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516768252-2-10122020329478959784 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=1516768251; b=jXyXy2JE5ajPoTv+/xWIrb0255ynK3yAJtNSk3uRJVP4+ba CqvLAZ423YUVIEb8a2RmoGNQZWnrNLhuztl2KzQCxJfxachn7Ozp0xh9NFRno5Wh 0d/X/zq3j6QElPB4fKLEtNmfLP5pENkiGNqFXpJnFRMypdY6urRezwt1x05SrEfI yGJnJfp8qpN1VggJhKEQbRE9R4oQyFirKXxRz1GtR2ZP6ie+zQkFBdaYFWsC4lUP +DRIdyM7iFPQiTGPsOWd3jrQ2a++HK+Ie1l2NdNGNTJF0+cVU4wbEwGhKsN6sOrb dWrBKgxG8GyM0MUB5j9XJNZlNWF38PUGEt6DEtw== 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=1516768251; bh=LFTfUB 1MwKe12W1wpI5YjGVq02Mzh5e5R2rguCdl34w=; b=SQgYe1oYt+53CAeUyYFbmV O20NBxTPKI5HBARRnwZ54q31rr2503wGsd7/6MOEl90IXOcmE5+3GGmOdFxeC2+s t1IeLgqewF5Ug8IbxP2e2opSaaOfwppHYIVDyomF4rI62P3YhS4ZWzqj+WR2bB7P 8kClHnf8OABDtjNF/QNsD1lAa/2UXqndRe/NVskCYP5l8T8k8PnJJ7KYb4mZTDjj CFFGHHFiX0IhiNKDdsTJhwYiMio4jnN3Qw8hpUcGeaV7nh6ZcWt8TFwNqsALar0o EPeTR+9Ajk9M/HlVrDETp7Xa6VswwyEux8nqV3FHjJ98dk5+EGZbvp8fxiQ531lQ == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=nJpn84LQ 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: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=nJpn84LQ 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 S932923AbeAXEag (ORCPT ); Tue, 23 Jan 2018 23:30:36 -0500 Received: from mail-dm3nam03on0104.outbound.protection.outlook.com ([104.47.41.104]:64192 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933172AbeAXETV (ORCPT ); Tue, 23 Jan 2018 23:19:21 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Michael Lyle , Jens Axboe , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 09/35] bcache: check return value of register_shrinker Thread-Topic: [PATCH AUTOSEL for 4.4 09/35] bcache: check return value of register_shrinker Thread-Index: AQHTlMors2+8G8uk5EKthoOLfKkoPw== Date: Wed, 24 Jan 2018 04:16:56 +0000 Message-ID: <20180124041645.32420-9-alexander.levin@microsoft.com> References: <20180124041645.32420-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041645.32420-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;DM5PR2101MB1094;7:jT2K6kGE7Rm3IwSpwpsgP9UQ4Hv4Fdk6BJ6lV4dx7HRNCbMLrlDQ5kp6m5mnwV7eDGELLH6WEEey1wWMRsP7qk4LTjCzMtwsQOZKFmnfksDNNI9mTNYB8QJqzHYSYRvcAOPxBmLVvcz9Yiy6QvaN2wMVHxH57orky16kaLDrC8JliE3OQWnj/cX0VBbufpdCQ0oCB69oW2ksA3d3qSLdt4WpF73uKYXW5y8xXQIyVCuBZL1YDY9rQo/uE2+l0/pe x-ms-office365-filtering-correlation-id: aea439e7-90e3-4eae-8138-08d562e1a2e8 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:DM5PR2101MB1094; x-ms-traffictypediagnostic: DM5PR2101MB1094: 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)(10201501046)(3002001)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB1094;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1094; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(376002)(396003)(366004)(39860400002)(39380400002)(199004)(189003)(14454004)(99286004)(10090500001)(2906002)(86612001)(2900100001)(2950100002)(575784001)(107886003)(5250100002)(2501003)(26005)(316002)(4326008)(97736004)(54906003)(106356001)(110136005)(25786009)(6666003)(5660300001)(36756003)(305945005)(86362001)(8936002)(3280700002)(6116002)(68736007)(102836004)(3660700001)(6512007)(10290500003)(72206003)(1076002)(105586002)(6436002)(22452003)(59450400001)(53936002)(478600001)(3846002)(7736002)(6486002)(6346003)(81156014)(66066001)(6506007)(8676002)(76176011)(81166006)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1094;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: pD4t640KZbqBYWYJWRG6v0Np5Fw8+NLVn7Eq5dTU/0srJpLZx9+lfJaOZRnVnG4z5XYFpGNoh6Rz+n9krZRmQA== 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: aea439e7-90e3-4eae-8138-08d562e1a2e8 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:16:56.4393 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1094 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: Michael Lyle [ Upstream commit 6c4ca1e36cdc1a0a7a84797804b87920ccbebf51 ] register_shrinker is now __must_check, so check it to kill a warning. Caller of bch_btree_cache_alloc in super.c appropriately checks return value so this is fully plumbed through. This V2 fixes checkpatch warnings and improves the commit description, as I was too hasty getting the previous version out. Signed-off-by: Michael Lyle Reviewed-by: Vojtech Pavlik Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/md/bcache/btree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 5b815e64c1c9..a5a6909280fe 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -808,7 +808,10 @@ int bch_btree_cache_alloc(struct cache_set *c) c->shrink.scan_objects =3D bch_mca_scan; c->shrink.seeks =3D 4; c->shrink.batch =3D c->btree_pages * 2; - register_shrinker(&c->shrink); + + if (register_shrinker(&c->shrink)) + pr_warn("bcache: %s: could not register shrinker", + __func__); =20 return 0; } --=20 2.11.0