From: NeilBrown Date: Mon, 22 Nov 2010 09:24:50 +0000 (+1100) Subject: Make Incremental_container static X-Git-Tag: mdadm-3.2~295 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=7d91c3f547dbbbfb8eded1b141b095ad511aafb5 Make Incremental_container static as it is only used in Incremental.c Signed-off-by: NeilBrown --- diff --git a/Incremental.c b/Incremental.c index 0978a81f..724ed5f2 100644 --- a/Incremental.c +++ b/Incremental.c @@ -40,6 +40,10 @@ static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra, static int try_spare(char *devname, int *dfdp, struct dev_policy *pol, struct supertype *st, int verbose); +static int Incremental_container(struct supertype *st, char *devname, + int verbose, int runstop, int autof, + int trustworthy); + int Incremental(char *devname, int verbose, int runstop, struct supertype *st, char *homehost, int require_homehost, int autof) @@ -1183,8 +1187,8 @@ static char *container2devname(char *devname) return mdname; } -int Incremental_container(struct supertype *st, char *devname, int verbose, - int runstop, int autof, int trustworthy) +static int Incremental_container(struct supertype *st, char *devname, int verbose, + int runstop, int autof, int trustworthy) { /* Collect the contents of this container and for each * array, choose a device name and assemble the array. diff --git a/mdadm.h b/mdadm.h index 0dca8d26..7b651e27 100644 --- a/mdadm.h +++ b/mdadm.h @@ -929,9 +929,6 @@ extern int WaitClean(char *dev, int sock, int verbose); extern int Incremental(char *devname, int verbose, int runstop, struct supertype *st, char *homehost, int require_homehost, int autof); -extern int Incremental_container(struct supertype *st, char *devname, - int verbose, int runstop, int autof, - int trustworthy); extern void RebuildMap(void); extern int IncrementalScan(int verbose); extern int IncrementalRemove(char *devname, int verbose);