Incremental: Rename IncrementalRemove

Rename it to Incremental_remove for better readability.
No functional changes.

Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>

diff --git a/Incremental.c b/Incremental.c
index c1389a15b51bf6662c46071292f4cae8517403dc..e7987d1d210fd597749b3e21e283973cd884f32c 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -1695,7 +1695,7 @@ static bool is_devnode_path(char *devnode)
 }
 
 /**
- * IncrementalRemove() - Remove the device from all raid arrays.
+ * Incremental_remove() - Remove the device from all raid arrays.
  * @devname: the device we want to remove, it could be kernel device name or devnode.
  * @id_path: optional, /dev/disk/by-path path to save for bare scenarios support.
  * @verbose: verbose flag.
@@ -1703,7 +1703,7 @@ static bool is_devnode_path(char *devnode)
  * First, fail the device (if needed) and then remove the device from native raid array or external
  * container.  If it is external container, the device is removed from each subarray first.
  */
-int IncrementalRemove(char *devname, char *id_path, int verbose)
+int Incremental_remove(char *devname, char *id_path, int verbose)
 {
        char *devnm = basename(devname);
        struct mddev_dev devlist = {0};

diff --git a/mdadm.c b/mdadm.c
index 0b99fad497a97b24bc812579246e34099c0cbd5e..90fd157575c9bf637b9d4b960041c8df9ffb148c 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1703,8 +1703,7 @@ int main(int argc, char *argv[])
                                rv = 1;
                                break;
                        }
-                       rv = IncrementalRemove(devlist->devname, remove_path,
-                                              c.verbose);
+                       rv = Incremental_remove(devlist->devname, remove_path, c.verbose);
                } else
                        rv = Incremental(devlist, &c, ss);
                break;

diff --git a/mdadm.h b/mdadm.h
index f3b9f54c1396d697fa265b8b9b01cefa2898ec39..d4f5702c88b15708cd839960e137cd784bd2e139 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -1606,7 +1606,7 @@ extern int Incremental(struct mddev_dev *devlist, struct context *c,
                       struct supertype *st);
 extern void RebuildMap(void);
 extern int IncrementalScan(struct context *c, char *devnm);
-extern int IncrementalRemove(char *devname, char *path, int verbose);
+extern int Incremental_remove(char *devname, char *path, int verbose);
 extern int CreateBitmap(char *filename, int force, char uuid[16],
                        unsigned long chunksize, unsigned long daemon_sleep,
                        unsigned long write_behind,