From aa20503a8f93a134db5124e5a6b1ac5fff08cc87 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 May 2016 10:35:13 -0700 Subject: mdadm: Fix gcc 6 warnings Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../0001-raid6check-Fix-if-else-indentation.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 meta/recipes-extended/mdadm/files/0001-raid6check-Fix-if-else-indentation.patch (limited to 'meta/recipes-extended/mdadm/files') diff --git a/meta/recipes-extended/mdadm/files/0001-raid6check-Fix-if-else-indentation.patch b/meta/recipes-extended/mdadm/files/0001-raid6check-Fix-if-else-indentation.patch new file mode 100644 index 0000000000..0b34b8491f --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-raid6check-Fix-if-else-indentation.patch @@ -0,0 +1,37 @@ +From 1b0aa1debf6fbe9923c9aac671d2894f76c32f9d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 20 Apr 2016 16:38:13 +0000 +Subject: [PATCH] raid6check: Fix if-else indentation + +gcc 6 warns about ambiguity due to this indentation +| raid6check.c: In function 'manual_repair': +| raid6check.c:267:4: error: this 'else' clause does not guard... [-Werror=misleading-indentation] +| else +| ^~~~ +| raid6check.c:269:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' +| printf("Repairing D(%d) and P\n", failed_data); +| ^~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + raid6check.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/raid6check.c b/raid6check.c +index ad7ffe7..409b1b6 100644 +--- a/raid6check.c ++++ b/raid6check.c +@@ -266,7 +266,7 @@ int manual_repair(int chunk_size, int syndrome_disks, + failed_data = failed_slot2; + else + failed_data = failed_slot1; +- printf("Repairing D(%d) and P\n", failed_data); ++ printf("Repairing D(%d) and P\n", failed_data); + raid6_datap_recov(syndrome_disks+2, chunk_size, + failed_data, (uint8_t**)blocks, 1); + } else { +-- +1.9.1 + -- cgit 1.2.3-korg