From patchwork Tue Jan 28 14:06:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232593 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB579C2D0DB for ; Tue, 28 Jan 2020 14:32:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 972CC24687 for ; Tue, 28 Jan 2020 14:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221965; bh=KNT/RIVk/x73NLpD9nQB6BYohuSfGeNeCr1xlG9FM20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o5b76EY6oNe7i4K1S6ZkHDUADZkgeQuedaAzD6P5IkRB+fBAFSUqqfwOVwBCc2Ohw 5r2T7+n6S9+Go2Oq0MVQQM5VzokHHJhDNH1jnFHjtq+PpNJFJ4n+oh6kliULwVxgXl KHVgKH2jTDWOxfUi1euhs26W4eph4fZSzC3YTOb0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731682AbgA1O0G (ORCPT ); Tue, 28 Jan 2020 09:26:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:53362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729644AbgA1O0F (ORCPT ); Tue, 28 Jan 2020 09:26:05 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F019624685; Tue, 28 Jan 2020 14:26:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221565; bh=KNT/RIVk/x73NLpD9nQB6BYohuSfGeNeCr1xlG9FM20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mRUhbgaHn21dsudhAo+VSYJn1RNtKNAF8uzLgYUN9umJMMU62WfFfwFBilyjXwHit fhb7Ww0SCpOLXJWSTnEhfZNqvRqz8v1PyAnc/iFLyi43zjTQodpfqguJFXj+qaQ5xL ps+GgXVk4aBhXLwTKTsOgBnNeoe1/zN/2m4casPI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andy Shevchenko , Shaohua Li , Dmitry Torokhov Subject: [PATCH 4.9 268/271] md: Avoid namespace collision with bitmap API Date: Tue, 28 Jan 2020 15:06:57 +0100 Message-Id: <20200128135912.548904600@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andy Shevchenko commit e64e4018d572710c44f42c923d4ac059f0a23320 upstream. bitmap API (include/linux/bitmap.h) has 'bitmap' prefix for its methods. On the other hand MD bitmap API is special case. Adding 'md' prefix to it to avoid name space collision. No functional changes intended. Signed-off-by: Andy Shevchenko Acked-by: Shaohua Li Signed-off-by: Dmitry Torokhov [only take the bitmap_free change for stable - gregkh] Signed-off-by: Greg Kroah-Hartman --- drivers/md/bitmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -1699,7 +1699,7 @@ void bitmap_flush(struct mddev *mddev) /* * free memory that was allocated */ -static void bitmap_free(struct bitmap *bitmap) +static void md_bitmap_free(struct bitmap *bitmap) { unsigned long k, pages; struct bitmap_page *bp; @@ -1749,7 +1749,7 @@ void bitmap_destroy(struct mddev *mddev) if (mddev->thread) mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT; - bitmap_free(bitmap); + md_bitmap_free(bitmap); } /* @@ -1834,7 +1834,7 @@ struct bitmap *bitmap_create(struct mdde return bitmap; error: - bitmap_free(bitmap); + md_bitmap_free(bitmap); return ERR_PTR(err); } @@ -1936,7 +1936,7 @@ int bitmap_copy_from_slot(struct mddev * *low = lo; *high = hi; err: - bitmap_free(bitmap); + md_bitmap_free(bitmap); return rv; } EXPORT_SYMBOL_GPL(bitmap_copy_from_slot);