Received: by 10.213.65.68 with SMTP id h4csp680437imn; Fri, 6 Apr 2018 07:13:15 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+2neXu3naJDXtKBxmIRAgjVhSruc/MQQdRw9sadpHs4pIhBCQi8cAj61WnmAy7mr2fNi5p X-Received: by 2002:a17:902:207:: with SMTP id 7-v6mr27900274plc.261.1523023995001; Fri, 06 Apr 2018 07:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523023994; cv=none; d=google.com; s=arc-20160816; b=HsjBVP1692UVmk5b3M69JP9wki5b14b4YziOBvxTakinn14CJWhTDxVQZsa0vIlYPl SojucQZxNj0UwChdhRs0VaVa2tu4rynIF6U24m1L78wmsaKTXOimrcy16/ZHp+SoIUFO XB/aSvn/nTSaG5g39PQPOwJcJ5qNGtDSepni+T4lz0N8Rfc2C3SolWVtGyADJq2ovziG 1BGjwdgtAQRfImel9q9oeZxuOTeKVcrOQkTvedwOFIAOmgn/TxX0yI6WGW+Rf8OW3Dey gqSqKJb1hCKpNbB6+bj5OKqC1xcSYORvF8ovRJKBZhP5mOmZhu3qKPQGqlMOrEGubV0y 71Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=LT7PvvZRhZZRExTU25nGX3a3Mk1GYBRHLnp8shtCy/k=; b=nAkhGFjrvNT+MuhvV/mFjf0ROJ4vQx5jkIOedFK+4Qwt6iDLCv60pcXOOE5A6JCN60 uQvMH53vBtTX6v5sZ4Sd7p4BhJK5I44zk7DRdvto0nTCk9kmxGtljuXCwhHdfTRfidIx QG98LFq867lPkeDvPWARhzsN+fvdddEIzKnVOms74L6TQkj7bURm4mnxknNuh4YT0+8G NTkOvpt5dkKpfQkQe9Wc1ys6ixyQTFh+QUxDiRQlVjQy1z8b6a8TIECudqeeIdcFI2yj eayjGJvNNQ9s7GcezCzmEkGu8el6G3wJ2Ta08PgBb6vgPPJ1jO9AmT5Eq+0aUrFwApJx ledg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g124si5947834pgc.163.2018.04.06.07.13.00; Fri, 06 Apr 2018 07:13:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756517AbeDFOL6 (ORCPT + 99 others); Fri, 6 Apr 2018 10:11:58 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:35486 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756264AbeDFNkO (ORCPT ); Fri, 6 Apr 2018 09:40:14 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id A7E65DD2; Fri, 6 Apr 2018 13:40:10 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mikulas Patocka , Jens Axboe Subject: [PATCH 4.14 63/67] Fix slab name "biovec-(1<<(21-12))" Date: Fri, 6 Apr 2018 15:24:33 +0200 Message-Id: <20180406084348.612700208@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084341.225558262@linuxfoundation.org> References: <20180406084341.225558262@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mikulas Patocka commit bd5c4facf59648581d2f1692dad7b107bf429954 upstream. I'm getting a slab named "biovec-(1<<(21-12))". It is caused by unintended expansion of the macro BIO_MAX_PAGES. This patch renames it to biovec-max. Signed-off-by: Mikulas Patocka Cc: stable@vger.kernel.org # v4.14+ Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- block/bio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/block/bio.c +++ b/block/bio.c @@ -43,9 +43,9 @@ * break badly! cannot be bigger than what you can fit into an * unsigned short */ -#define BV(x) { .nr_vecs = x, .name = "biovec-"__stringify(x) } +#define BV(x, n) { .nr_vecs = x, .name = "biovec-"#n } static struct biovec_slab bvec_slabs[BVEC_POOL_NR] __read_mostly = { - BV(1), BV(4), BV(16), BV(64), BV(128), BV(BIO_MAX_PAGES), + BV(1, 1), BV(4, 4), BV(16, 16), BV(64, 64), BV(128, 128), BV(BIO_MAX_PAGES, max), }; #undef BV