From patchwork Tue May 9 10:04:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98893 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1739415qge; Tue, 9 May 2017 03:05:18 -0700 (PDT) X-Received: by 10.99.127.26 with SMTP id a26mr4227833pgd.75.1494324318432; Tue, 09 May 2017 03:05:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494324318; cv=none; d=google.com; s=arc-20160816; b=qtTjtfFtN4dmw28sQFz/5CfNtvv3iYmKRNUz8QQGg3Aaw+nAwDPFGINE8BADpe5RVu 0s497RAfQu4AYKKtsLyzASKst+pNbkBPgdG0atMCI7FD4dGSstvNGc6pgV3QgO+uW8y4 jomoo844FlXrFv6kcNpH/91vuquOHD+SkKzRC+1b0k1cfKf9I1s9k3p0YPQW6MVzgDtf /vXgIIf/ZFP5QJG/OO7lPnVPyCTSYHoUS8HOPKDxfqMGxkMwws3RseWNwknmh0TNEThx tVKzIfBW5GJ9QJothDwPylUojXk8aIrhRNPS6NZJyLfKghjNMp2tSrpjyK1dN9RLBTGv 2CvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=NjSeKpd6ZcOvVZbcYhEr2DooNG5TPOnk0qulICw61ZQ=; b=fO82gRc5pQ2gMK5tyIDcgfak9avZeioqgfs8ElTX+Z2SwWtJB7wgOH+Q3r+43oohCR WdQuUqdWqVc1blGyMOBdKl+a0VYJxngT2w/+Utdk0+TzK3Cx3werHRif0KMkfG8NRbmB eixIOGq+1wmErxYOx2a9TLWmdEBUC8mgo/YwhkHRwGNSNujPLBC8FStJ2SNb7JsLYIY0 yMcxvZxoPMCk11ZYc8F8/PPvfnjM6aSGbdRrMjl+BC3ZIjIXJ8ANeZZiAUr0jEAfc71T 2ku5BfuLEe/wwwd8N7xW47dmcTuHG1QTYiiF2rqpFmUw+njd2Waxzlv2hQ8BBr/PC2BS saKw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h13si12805392pgn.51.2017.05.09.03.05.18; Tue, 09 May 2017 03:05:18 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751203AbdEIKFR (ORCPT + 6 others); Tue, 9 May 2017 06:05:17 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:53636 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751295AbdEIKFQ (ORCPT ); Tue, 9 May 2017 06:05:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.129]) with ESMTPA (Nemesis) id 0MTtCv-1dYG723Wvh-00QhN3; Tue, 09 May 2017 12:05:09 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Lars Ellenberg , Philipp Reisner , Jens Axboe , Arnd Bergmann Subject: [PATCH 3.16-stable 03/14] drbd: avoid redefinition of BITS_PER_PAGE Date: Tue, 9 May 2017 12:04:51 +0200 Message-Id: <20170509100502.1358298-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170509100502.1358298-1-arnd@arndb.de> References: <20170509100502.1358298-1-arnd@arndb.de> X-Provags-ID: V03:K0:idEAqQ6FshTaSfqahKex5xhWBiSv497XvgHMc2JJQsZhO6YvF7n w5D9dTNOKZKG5N1Q2dvzYUdRQLUVQDwoK82n/djgyx5OOIrWKtm7hceWVmTAuSP+7Ggjffg RUvT/rWoZUbwzpQwX8tWk6Oon3u8lQg3RB8VqwXaCjxc8mYmRcq+VjqzfFiGU1npvrDo4K5 KTOjCr3fwqtE7bEkXNX6A== X-UI-Out-Filterresults: notjunk:1; V01:K0:acQuKuFUwhs=:wq/F108I1HaTSCwwHLW78Q sDrDw6WkT4H6TgLRIrO5/h5u+IcM9ODA3df1aIO3V/mUeLQf3KMTimk0QfXPXumYNAeo+vMAf QeEg6InjHGzRO1A45OvuSGbFEQwkT5hmMyTSslXKvjybcWxonOXcEW36hQBGO05q3n+Fzb5qr Msc8IctDt11xuNj4Y3BJ/6YVtYxjfDAJstmn5UZ4M+cujMkMe7hYq14vXXQu4PQ7AJN73Q1Yp fVeI5kAHFxUgcnZ3nHNasKWcCWjAUHZJkVWkRskG7Hm3O1Jw91IQ4nfS5gxUyyy3fdV/TbzvZ QBMl/265zRVItMy0FPb75nn7+RIk5JehtMZ3b61dwG+i0fO1RoBhJ0HyHqetfEqd6yNJM1KFs bgUe4R7j6fVWERf3uEK5MsPwd6VHY50+GW0KElpBMcAp9R43JuLwe6FXfPeIzdzrtjp8UPynR yyPRkHRsiWqoqloJqQ/LBzNSz6bNsxj2+vPZjPLCR6PYT3bj0ejvcIKHfUVRxyqAifWvq8/es DVr1s8E1RyyRDW8z4reUZs7yUW2ozPYGJTmJNEP90CDBYftg/UM7zQEREEaiHK5ZwHRMCMi1Z 9F0Fn5O6FD3pwBgUtpVpEDnRDvZUjO0YH/k9mId8LtmmlDO2lbDhjlP7Ly97gcUGuhcpByj+j QryKHQklVd2sJRykbbXAbYP9Po5XxJNDW27omQYJgYsBlXUNegLi8B40sWNg+NUAmT4I= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lars Ellenberg Commit 2630628b2dbc3fc320aafaf84836119e4e3d62f1 upstream. Apparently we now implicitly get definitions for BITS_PER_PAGE and BITS_PER_PAGE_MASK from the pid_namespace.h Instead of renaming our defines, I chose to define only if not yet defined, but to double check the value if already defined. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe Signed-off-by: Arnd Bergmann --- drivers/block/drbd/drbd_bitmap.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.9.0 diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 1aa29f8fdfe1..7c76f7270bec 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c @@ -478,8 +478,14 @@ void drbd_bm_cleanup(struct drbd_device *device) * this masks out the remaining bits. * Returns the number of bits cleared. */ +#ifndef BITS_PER_PAGE #define BITS_PER_PAGE (1UL << (PAGE_SHIFT + 3)) #define BITS_PER_PAGE_MASK (BITS_PER_PAGE - 1) +#else +# if BITS_PER_PAGE != (1UL << (PAGE_SHIFT + 3)) +# error "ambiguous BITS_PER_PAGE" +# endif +#endif #define BITS_PER_LONG_MASK (BITS_PER_LONG - 1) static int bm_clear_surplus(struct drbd_bitmap *b) {