From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+KirXJsCGmSMX18ipG1tGObGBBrU2MIqCd4E35gyqa7Mq+QCVf43FSPJckiz0BEXFmfH0J ARC-Seal: i=1; a=rsa-sha256; t=1523021814; cv=none; d=google.com; s=arc-20160816; b=w+mOaMgnKkUroobusRPVhuMOWuBrYccVW7tNMaDq1sjuUN27HR/wLKGTOmXXThx/Ao jKH4G9wSXS4vssGKoUMEvp1hYw+x1VCMtgXjiw58N8WuJAEQltprPDf2DIUBmjigDP+5 yoz8t333P+BUt+efc3c6wHStSRHFylMMw0+scZPPGhTyyPYWC1QcdyrcmC1NSH86xohF kO24N1IYXgQk7MJSOU7V+OMrnWCKSSfewELw10MoC9moDgIqLrjW3Yq3TqCbSrQZMXip TjOGIghKKldLm9yUd5pySjGZhi6+9+f+6MKau+A7bah1DzlVHjL2G3w8T5Dsmjf5GqsQ L1Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=bJizX2qP/6MScIQ14/aZ3THU5kZdg7Xob0ldKe+0naI=; b=tZCHB5lKB/aMss4FUQ1ZIbZJeoHJp3PMR4HoD+R3bfyRumrM3wTBFCphQqIIy+huGS TNQVwGf0IBqZ1By4Lo9P19mboiH9LBhhM9Lb0Wymt3j07NtxRKZz6fccvb1hb9O9/jpN K7SRSbMWNmDjP6l6gqRtgVjx3C1lw+9z41Acp+xwV8qFvU++iMdabVyLFX/qNOZQgLLK 9NrAT3hO7GBOXwV/j70BfsFnQPtNF3h9RzUZlFuUJ99CHcipSngUPKupMgkhJQXGknRJ 6wzuRrzEbseUl12EnUDJcVvcpkLnae3QqTL6KABG2FSENYBR7X1XEU2jA7H6YP7C1OHu rnKg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org 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.9 096/102] Fix slab name "biovec-(1<<(21-12))" Date: Fri, 6 Apr 2018 15:24:17 +0200 Message-Id: <20180406084344.917815233@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084331.507038179@linuxfoundation.org> References: <20180406084331.507038179@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597004122031445123?= X-GMAIL-MSGID: =?utf-8?q?1597004122031445123?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-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 @@ -42,9 +42,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