Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5475640 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

md: Avoid namespace collision with bitmap API 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarShaohua Li <shli@kernel.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
[only take the bitmap_free change for stable - gregkh]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df19092a

drivers/md/bitmap.c

+4 −4
Original line number Diff line number Diff line
@@ -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 mddev *mddev, int slot) 


	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 *mddev, int slot, 
	*low = lo;

	*high = hi;

err:

	bitmap_free(bitmap);

	md_bitmap_free(bitmap);

	return rv;

}

EXPORT_SYMBOL_GPL(bitmap_copy_from_slot);