diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-09 23:27:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-11 10:53:44 +0000 |
commit | b93bd0e85ec9e5646e08639771e8d787820df8f8 (patch) | |
tree | 8ba72528c9369573eca192e646baf4e49595c198 /meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch | |
parent | 633b403b6db40cf1a88a4e952615c03f290227ea (diff) | |
download | poky-b93bd0e85ec9e5646e08639771e8d787820df8f8.tar.gz |
mdadm: update 4.1 -> 4.2
Drop 0001-Compute-abs-diff-in-a-standard-compliant-way.patch
(upstream refactored code)
mdadm-fix-ptest-build-errors.patch
(upstream fixed the issue)
(From OE-Core rev: acf82e36996c082f52c02d50b06965f74ef87430)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch')
-rw-r--r-- | meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch b/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch deleted file mode 100644 index 8e2a8a9043..0000000000 --- a/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 911f6ea9be0c334885aeff66853b111cbd4066df Mon Sep 17 00:00:00 2001 | ||
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Wed, 10 Feb 2016 17:28:05 +0200 | ||
4 | Subject: [PATCH] mdadm-fix-ptest-build-errors | ||
5 | |||
6 | builds fail with ptest enabled: | ||
7 | |||
8 | | restripe.c: In function 'test_stripes': | ||
9 | | restripe.c:845:4: error: ignoring return value of 'read', declared with | ||
10 | | attribute warn_unused_result [-Werror=unused-result] | ||
11 | | read(source[i], stripes[i], chunk_size); | ||
12 | | ^ | ||
13 | | cc1: all warnings being treated as errors | ||
14 | | Makefile:214: recipe for target 'test_stripe' failed | ||
15 | |||
16 | Upstream-Status: Pending | ||
17 | |||
18 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
19 | |||
20 | --- | ||
21 | restripe.c | 6 +++++- | ||
22 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/restripe.c b/restripe.c | ||
25 | index 31b07e8..592ba5d 100644 | ||
26 | --- a/restripe.c | ||
27 | +++ b/restripe.c | ||
28 | @@ -864,10 +864,14 @@ int test_stripes(int *source, unsigned long long *offsets, | ||
29 | |||
30 | while (length > 0) { | ||
31 | int disk; | ||
32 | + ssize_t ret; | ||
33 | |||
34 | for (i = 0 ; i < raid_disks ; i++) { | ||
35 | lseek64(source[i], offsets[i]+start, 0); | ||
36 | - read(source[i], stripes[i], chunk_size); | ||
37 | + ret = read(source[i], stripes[i], chunk_size); | ||
38 | + if (ret == -1) { | ||
39 | + printf("Read Failed\n"); | ||
40 | + } | ||
41 | } | ||
42 | for (i = 0 ; i < data_disks ; i++) { | ||
43 | int disk = geo_map(i, start/chunk_size, raid_disks, | ||