| From foo@baz Tue 28 Jan 2020 12:49:12 PM CET |
| Date: Tue, 28 Jan 2020 12:49:12 +0100 |
| To: Greg KH <gregkh@linuxfoundation.org> |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Subject: md: Avoid namespace collision with bitmap API |
| |
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| |
| 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 <andriy.shevchenko@linux.intel.com> |
| Acked-by: Shaohua Li <shli@kernel.org> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| [only take the bitmap_free change for stable - gregkh] |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| 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); |