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: 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>

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 0cabf31fb163a3fa582035ecc77be37d56a949b6..7eb76a1a25053477c69afe6cb9806f8c7d5b9f27 100644 (file)
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1729,7 +1729,7 @@ void bitmap_flush(struct mddev *mddev)
 /*
  * free memory that was allocated
  */
-void bitmap_free(struct bitmap *bitmap)
+void md_bitmap_free(struct bitmap *bitmap)
 {
        unsigned long k, pages;
        struct bitmap_page *bp;
@@ -1763,7 +1763,7 @@ void bitmap_free(struct bitmap *bitmap)
        kfree(bp);
        kfree(bitmap);
 }
-EXPORT_SYMBOL(bitmap_free);
+EXPORT_SYMBOL(md_bitmap_free);
 
 void bitmap_wait_behind_writes(struct mddev *mddev)
 {
@@ -1796,7 +1796,7 @@ void bitmap_destroy(struct mddev *mddev)
        if (mddev->thread)
                mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT;
 
-       bitmap_free(bitmap);
+       md_bitmap_free(bitmap);
 }
 
 /*
@@ -1887,7 +1887,7 @@ struct bitmap *bitmap_create(struct mddev *mddev, int slot)
 
        return bitmap;
  error:
-       bitmap_free(bitmap);
+       md_bitmap_free(bitmap);
        return ERR_PTR(err);
 }
 
@@ -1958,7 +1958,7 @@ struct bitmap *get_bitmap_from_slot(struct mddev *mddev, int slot)
 
        rv = bitmap_init_from_disk(bitmap, 0);
        if (rv) {
-               bitmap_free(bitmap);
+               md_bitmap_free(bitmap);
                return ERR_PTR(rv);
        }
 

diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index 5df35ca90f58b5b9156913a478d1f51f561a0a7a..dd53a978c5f26769c2af827484367430a42fcf62 100644 (file)
--- a/drivers/md/bitmap.h
+++ b/drivers/md/bitmap.h
@@ -271,7 +271,7 @@ int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
 struct bitmap *get_bitmap_from_slot(struct mddev *mddev, int slot);
 int bitmap_copy_from_slot(struct mddev *mddev, int slot,
                                sector_t *lo, sector_t *hi, bool clear_bits);
-void bitmap_free(struct bitmap *bitmap);
+void md_bitmap_free(struct bitmap *bitmap);
 void bitmap_wait_behind_writes(struct mddev *mddev);
 #endif
 

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 717aaffc227dfa942821bebf4133670dbc684d95..10057ac85476ec099aef71bacf718bdc41a621c5 100644 (file)
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1128,7 +1128,7 @@ int cluster_check_sync_size(struct mddev *mddev)
                bm_lockres = lockres_init(mddev, str, NULL, 1);
                if (!bm_lockres) {
                        pr_err("md-cluster: Cannot initialize %s\n", str);
-                       bitmap_free(bitmap);
+                       md_bitmap_free(bitmap);
                        return -1;
                }
                bm_lockres->flags |= DLM_LKF_NOQUEUE;
@@ -1142,11 +1142,11 @@ int cluster_check_sync_size(struct mddev *mddev)
                        sync_size = sb->sync_size;
                else if (sync_size != sb->sync_size) {
                        kunmap_atomic(sb);
-                       bitmap_free(bitmap);
+                       md_bitmap_free(bitmap);
                        return -1;
                }
                kunmap_atomic(sb);
-               bitmap_free(bitmap);
+               md_bitmap_free(bitmap);
        }
 
        return (my_sync_size == sync_size) ? 0 : -1;