From patchwork Thu Jan 18 20:59:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125027 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp293844lja; Thu, 18 Jan 2018 12:59:56 -0800 (PST) X-Google-Smtp-Source: ACJfBouTxZX8gaEdnQlQ1Cgqu4eZ2jypEF5PeaVHAMKHaCl/IjUTJAbr2k5GPzqeF0LdNP4ukLJz X-Received: by 10.99.115.94 with SMTP id d30mr27360902pgn.172.1516309196834; Thu, 18 Jan 2018 12:59:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309196; cv=none; d=google.com; s=arc-20160816; b=kMWEyV4VmUxaXhCNQ8Zd75Wx/YZexYMVxZcOUsfHYcnGUYNxIXIxJs+2a3K3plZPpo EdzBXcUypnkfQsGyr4vmG3mAANGgXQPFCSIWB4nnksWgkb27myypTB8ksyRQrtpvnZE2 XOk+amQyGXfmrXHhSPSxSbuzsJh/GW8n6Fs70pqMCACmvbp9XMHXtjy8EZeaMjAu9Yci Tvk6XhbNyhsSpuXDBdSgdKBlp8nm/Z6djivXHJmj4fIEVc5Wm+FYBTetVtuxo/E1tmME uNHywPCg/w+N3Z1ksSmMJIrX14TLJBwRGYxaZk5Z7gxMRe6duiAOR+9GvSHbJwvd2im7 7d2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=3xlqMDbBg3nuLohZ1CBhUA0rVVOngv7w7z92rpfApBU=; b=YLly9Jl0lrWSNqdcoq7u3zQ6FdtMgFDsMdc8GXpjFuzt/CFc2FsHuUPEItePR1f2/B YfB7OBsSZC/fCta1ghelZmeWDQmvGp5p2a5FJVat4e6nVqXPEPbaQ0XEgzo0HGvYNhKm hzZkZ6Lk1UTrmZrLiJ9B9fBTirn7V3hEDD0nzeBpbQKNVodhgF5B8E7I9WIjz+3Oty8m E6z09Fbcg5mRsTQm8Qee6VjzWB7Cwnp6CHoWa5ZIjplwuzkPGJqGBPtpX9tG4mtckcx/ oQ7RK0169z1yo0qM9wjq4PFRaVa/qM3CwTqcJ68Qzqpa5lbnxQm0Wk6KWYnS+DMWS83S uErA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=n3avMrXF; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16si4933770pgu.706.2018.01.18.12.59.56; Thu, 18 Jan 2018 12:59:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=n3avMrXF; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753762AbeARU7z (ORCPT + 10 others); Thu, 18 Jan 2018 15:59:55 -0500 Received: from mail-sn1nam01on0138.outbound.protection.outlook.com ([104.47.32.138]:43424 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932379AbeARU7p (ORCPT ); Thu, 18 Jan 2018 15:59:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=3xlqMDbBg3nuLohZ1CBhUA0rVVOngv7w7z92rpfApBU=; b=n3avMrXFbx5V+YXLaRDJPFCp/W75mbSjWIGlKaxrIYMIaTtWv8WPkxHM957j7whz13r8cWBdmR1Yy0SE2Mh7myqQf7P+qTa2m+UsKjPBZ5DXiHKhQX+U9RlzUEvHqe1QnHcZlaaahXvkvtBbRKrsKrOXJdfvKAn6MkX+oxUCYqU= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1111.namprd21.prod.outlook.com (52.132.132.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.444.5; Thu, 18 Jan 2018 20:59:38 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 20:59:38 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Ilya Dryomov , "Sasha Levin" Subject: [added to the 4.1 stable tree] libceph: use BUG() instead of BUG_ON(1) Thread-Topic: [added to the 4.1 stable tree] libceph: use BUG() instead of BUG_ON(1) Thread-Index: AQHTkJ8+d2HvNZJNuUuXAEkSeAkc9g== Date: Thu, 18 Jan 2018 20:59:34 +0000 Message-ID: <20180118205908.3220-22-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.98.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1111; 7:eAcc83GSmrHBvWzSIAuWqeRW/eC9Yt3U791C/R5hI42+CJRQXuACzjhjUyjPN15L/AlICNKoj8wMIszaEoXi0Pp6NMzmD0Sb/H4ZhQToeBYNb5Tb6gMdqfe8iBODT45gVkitoyoZsu5y1/td8j3w+HAvYaQ0ijvP9YHFjYY0mLGVps0f7cZSn8lTM40uQtzTnTJg1Yr4umGAZ/+GWiZdRnu3KSBIynYQYky/L2vvrqqEa8YBm7EL5xLXvoDFS3Wy x-ms-office365-filtering-correlation-id: afc6b97f-3f7e-47a1-b827-08d55eb66341 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB1111; x-ms-traffictypediagnostic: DM5PR2101MB1111: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231046)(2400067)(944501161)(6055026)(61426038)(61427038)(6041282)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:DM5PR2101MB1111; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB1111; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(346002)(396003)(376002)(366004)(199004)(189003)(6512007)(6486002)(25786009)(6436002)(6506007)(76176011)(5660300001)(106356001)(6666003)(36756003)(105586002)(99286004)(26005)(86612001)(8936002)(4326008)(66066001)(2900100001)(39060400002)(8676002)(81166006)(81156014)(2906002)(68736007)(107886003)(2950100002)(7736002)(305945005)(86362001)(316002)(22452003)(110136005)(54906003)(14454004)(97736004)(3660700001)(1076002)(478600001)(10290500003)(6116002)(5250100002)(72206003)(6346003)(3280700002)(10090500001)(3846002)(53936002)(59450400001)(2501003)(102836004)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1111; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: jxmVgamppOgJt2RTkOL/KKOG/+MJhP28FSdUV8yPlZdu42qKPHFQLfnIQMGlkNEZsOUDJcZ6dXFNU3zHqcE9vg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: afc6b97f-3f7e-47a1-b827-08d55eb66341 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 20:59:34.9166 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1111 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit d24cdcd3e40a6825135498e11c20c7976b9bf545 ] I ran into this compile warning, which is the result of BUG_ON(1) not always leading to the compiler treating the code path as unreachable: include/linux/ceph/osdmap.h: In function 'ceph_can_shift_osds': include/linux/ceph/osdmap.h:62:1: error: control reaches end of non-void function [-Werror=return-type] Using BUG() here avoids the warning. Signed-off-by: Arnd Bergmann Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- include/linux/ceph/osdmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h index e55c08bc3a96..0abc56140c83 100644 --- a/include/linux/ceph/osdmap.h +++ b/include/linux/ceph/osdmap.h @@ -49,7 +49,7 @@ static inline bool ceph_can_shift_osds(struct ceph_pg_pool_info *pool) case CEPH_POOL_TYPE_EC: return false; default: - BUG_ON(1); + BUG(); } }