adfbb8ebd5
If mdcheck_start service can finish check action, it doesn't need to start mdcheck_continue service. So in rhel only patch mdcheck.patch, we stop mdcheck_continue timer. And there is a history problem. It needed KillMode=none before, so it removed the upstream patch 52c67fcdd. Now this problem has been fixed, so we can do the backport more easilly now. We don't need to remove the upstream patch here again. Resolves: rhbz#2116418, rhbz#2150862, rhbz#2159584 Signed-off-by: Xiao Ni <xni@redhat.com>
42 lines
1.0 KiB
Diff
42 lines
1.0 KiB
Diff
From a0151041642dffff2421c22e18fb7b02b58787d9 Mon Sep 17 00:00:00 2001
|
|
From: Coly Li <colyli@suse.de>
|
|
Date: Sat, 4 Mar 2023 00:21:30 +0800
|
|
Subject: [PATCH 093/125] util.c: reorder code lines in parse_layout_faulty()
|
|
|
|
Resort the code lines in parse_layout_faulty() to make it more
|
|
comfortable, no logic change.
|
|
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
|
|
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
|
---
|
|
util.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/util.c b/util.c
|
|
index 7fc881bf..b0b7aec4 100644
|
|
--- a/util.c
|
|
+++ b/util.c
|
|
@@ -421,12 +421,15 @@ int parse_layout_10(char *layout)
|
|
|
|
int parse_layout_faulty(char *layout)
|
|
{
|
|
+ int ln, mode;
|
|
+ char *m;
|
|
+
|
|
if (!layout)
|
|
return -1;
|
|
+
|
|
/* Parse the layout string for 'faulty' */
|
|
- int ln = strcspn(layout, "0123456789");
|
|
- char *m = xstrdup(layout);
|
|
- int mode;
|
|
+ ln = strcspn(layout, "0123456789");
|
|
+ m = xstrdup(layout);
|
|
m[ln] = 0;
|
|
mode = map_name(faultylayout, m);
|
|
if (mode == UnSet)
|
|
--
|
|
2.38.1
|
|
|