1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index c4b913409226..4e3843f7d245 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1044,7 +1044,7 @@ static void raid1_unplug(struct blk_plug_cb *cb, bool from_schedule)
         kfree(plug);
 }
 
-static void make_request(struct mddev *mddev, struct bio * bio)
+static void raid1_make_request(struct mddev *mddev, struct bio * bio)
 {
         struct r1conf *conf = mddev->private;
         struct raid1_info *mirror;
@@ -1422,7 +1422,7 @@ read_again:
         wake_up(&conf->wait_barrier);
 }
 
-static void status(struct seq_file *seq, struct mddev *mddev)
+static void raid1_status(struct seq_file *seq, struct mddev *mddev)
 {
         struct r1conf *conf = mddev->private;
         int i;
@@ -1439,7 +1439,7 @@ static void status(struct seq_file *seq, struct mddev *mddev)
         seq_printf(seq, "]");
 }
 
-static void error(struct mddev *mddev, struct md_rdev *rdev)
+static void raid1_error(struct mddev *mddev, struct md_rdev *rdev)
 {
         char b[BDEVNAME_SIZE];
         struct r1conf *conf = mddev->private;
@@ -2472,7 +2472,8 @@ static int init_resync(struct r1conf *conf)
  * that can be installed to exclude normal IO requests.
  */
 
-static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipped)
+static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
+                                   int *skipped)
 {
         struct r1conf *conf = mddev->private;
         struct r1bio *r1_bio;
@@ -2890,7 +2891,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
 }
 
 static void raid1_free(struct mddev *mddev, void *priv);
-static int run(struct mddev *mddev)
+static int raid1_run(struct mddev *mddev)
 {
         struct r1conf *conf;
         int i;
@@ -3170,15 +3171,15 @@ static struct md_personality raid1_personality =
         .name           = "raid1",
         .level          = 1,
         .owner          = THIS_MODULE,
-        .make_request   = make_request,
-        .run            = run,
+        .make_request   = raid1_make_request,
+        .run            = raid1_run,
         .free           = raid1_free,
-        .status         = status,
-        .error_handler  = error,
+        .status         = raid1_status,
+        .error_handler  = raid1_error,
         .hot_add_disk   = raid1_add_disk,
         .hot_remove_disk= raid1_remove_disk,
         .spare_active   = raid1_spare_active,
-        .sync_request   = sync_request,
+        .sync_request   = raid1_sync_request,
         .resize         = raid1_resize,
         .size           = raid1_size,
         .check_reshape  = raid1_reshape,