diff options
Diffstat (limited to 'meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch')
-rw-r--r-- | meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch b/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch index 739652cd55..361d53ca6c 100644 --- a/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch +++ b/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch @@ -1,4 +1,4 @@ -From b83218de2623c0bbe9af355a81ae8385d7f30cfc Mon Sep 17 00:00:00 2001 +From a6c991750ae6ebd87a0b9b243bec7fd8e5a064c5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 9 May 2018 12:56:41 -0700 Subject: [PATCH] Disable gcc8 warnings @@ -23,28 +23,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> mdopen.c | 4 ++++ super-ddf.c | 4 ++++ super-intel.c | 6 ++++++ - super1.c | 5 +++++ super0.c | 2 +- - 6 files changed, 22 insertions(+), 1 deletion(-) + super1.c | 5 +++++ + 6 files changed, 23 insertions(+), 2 deletions(-) -diff --git a/super0.c b/super0.c -index f5b4507..264b598 100644 ---- a/super0.c -+++ b/super0.c -@@ -231,7 +231,7 @@ - d++) { - mdp_disk_t *dp; - char *dv; -- char nb[11]; -+ char nb[12]; - int wonly, failfast; - if (d>=0) dp = &sb->disks[d]; - else dp = &sb->this_disk; diff --git a/Monitor.c b/Monitor.c -index 802a9d9..23b246b 100644 +index 036103f..08cbd0a 100644 --- a/Monitor.c +++ b/Monitor.c -@@ -441,7 +441,8 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) +@@ -445,7 +445,8 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) event, dev); } } @@ -54,16 +41,16 @@ index 802a9d9..23b246b 100644 static int check_array(struct state *st, struct mdstat_ent *mdstat, int test, struct alert_info *ainfo, int increments, char *prefer) -@@ -683,6 +684,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, - return 1; - return 0; +@@ -673,6 +674,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, + st->err++; + goto out; } +#pragma GCC diagnostic pop static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, int test, struct alert_info *info) diff --git a/mdopen.c b/mdopen.c -index 685ca32..406aba4 100644 +index 98c54e4..4f72b69 100644 --- a/mdopen.c +++ b/mdopen.c @@ -26,6 +26,9 @@ @@ -76,19 +63,19 @@ index 685ca32..406aba4 100644 void make_parts(char *dev, int cnt) { /* make 'cnt' partition devices for 'dev' -@@ -99,6 +102,7 @@ void make_parts(char *dev, int cnt) +@@ -101,6 +104,7 @@ void make_parts(char *dev, int cnt) } free(name); } +#pragma GCC diagnostic pop - /* - * We need a new md device to assemble/build/create an array. + int create_named_array(char *devnm) + { diff --git a/super-ddf.c b/super-ddf.c -index 1707ad1..e08d289 100644 +index 618542c..6ed4e7e 100644 --- a/super-ddf.c +++ b/super-ddf.c -@@ -2846,6 +2846,9 @@ static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl) +@@ -2828,6 +2828,9 @@ static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl) (unsigned long long)cfs, (unsigned long long)(dl->size-cfs)); } @@ -98,7 +85,7 @@ index 1707ad1..e08d289 100644 /* Add a device to a container, either while creating it or while * expanding a pre-existing container */ -@@ -2981,6 +2984,7 @@ static int add_to_super_ddf(struct supertype *st, +@@ -2964,6 +2967,7 @@ static int add_to_super_ddf(struct supertype *st, return 0; } @@ -107,10 +94,10 @@ index 1707ad1..e08d289 100644 static int remove_from_super_ddf(struct supertype *st, mdu_disk_info_t *dk) { diff --git a/super-intel.c b/super-intel.c -index 00a2925..44fbead 100644 +index 1bc4b80..39d0e92 100644 --- a/super-intel.c +++ b/super-intel.c -@@ -298,6 +298,11 @@ struct md_list { +@@ -333,6 +333,11 @@ struct md_list { }; #define pr_vrb(fmt, arg...) (void) (verbose && pr_err(fmt, ##arg)) @@ -122,16 +109,29 @@ index 00a2925..44fbead 100644 static __u8 migr_type(struct imsm_dev *dev) { -@@ -11618,3 +11623,4 @@ struct superswitch super_imsm = { +@@ -12208,3 +12213,4 @@ struct superswitch super_imsm = { + .clear_bad_block = imsm_clear_badblock, .get_bad_blocks = imsm_get_badblocks, - #endif /* MDASSEMBLE */ }; +#pragma GCC diagnostic pop +diff --git a/super0.c b/super0.c +index 42989b9..f5e8031 100644 +--- a/super0.c ++++ b/super0.c +@@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost) + d++) { + mdp_disk_t *dp; + char *dv; +- char nb[11]; ++ char nb[12]; + int wonly, failfast; + if (d>=0) dp = &sb->disks[d]; + else dp = &sb->this_disk; diff --git a/super1.c b/super1.c -index 87a74cb..71c515f 100644 +index 636a286..f894cbb 100644 --- a/super1.c +++ b/super1.c -@@ -1091,6 +1091,10 @@ static struct mdinfo *container_content1(struct supertype *st, char *subarray) +@@ -1176,6 +1176,10 @@ static struct mdinfo *container_content1(struct supertype *st, char *subarray) return info; } @@ -140,9 +140,9 @@ index 87a74cb..71c515f 100644 +# pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif static int update_super1(struct supertype *st, struct mdinfo *info, - char *update, - char *devname, int verbose, -@@ -1473,6 +1477,7 @@ static int init_super1(struct supertype *st, mdu_array_info_t *info, + char *update, char *devname, int verbose, + int uuid_set, char *homehost) +@@ -1641,6 +1645,7 @@ static int init_super1(struct supertype *st, mdu_array_info_t *info, return 1; } |