1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
107 lines
3.2 KiB
Diff
107 lines
3.2 KiB
Diff
From ebf3be9931f31df54df52b1821479e6a80a4d9c6 Mon Sep 17 00:00:00 2001
|
|
From: Dimitri John Ledkov <xnox@ubuntu.com>
|
|
Date: Tue, 15 Jan 2019 19:08:37 +0000
|
|
Subject: [PATCH] Fix spelling typos.
|
|
Git-commit: ebf3be9931f31df54df52b1821479e6a80a4d9c6
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
Assemble.c | 2 +-
|
|
Create.c | 2 +-
|
|
Grow.c | 6 +++---
|
|
super-ddf.c | 2 +-
|
|
super-intel.c | 2 +-
|
|
5 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/Assemble.c b/Assemble.c
|
|
index 9f75c68..9f050c1 100644
|
|
--- a/Assemble.c
|
|
+++ b/Assemble.c
|
|
@@ -879,7 +879,7 @@ static int force_array(struct mdinfo *content,
|
|
current_events = devices[chosen_drive].i.events;
|
|
add_another:
|
|
if (c->verbose >= 0)
|
|
- pr_err("forcing event count in %s(%d) from %d upto %d\n",
|
|
+ pr_err("forcing event count in %s(%d) from %d up to %d\n",
|
|
devices[chosen_drive].devname,
|
|
devices[chosen_drive].i.disk.raid_disk,
|
|
(int)(devices[chosen_drive].i.events),
|
|
diff --git a/Create.c b/Create.c
|
|
index 04b1dfc..6f1b228 100644
|
|
--- a/Create.c
|
|
+++ b/Create.c
|
|
@@ -823,7 +823,7 @@ int Create(struct supertype *st, char *mddev,
|
|
}
|
|
bitmap_fd = open(s->bitmap_file, O_RDWR);
|
|
if (bitmap_fd < 0) {
|
|
- pr_err("weird: %s cannot be openned\n",
|
|
+ pr_err("weird: %s cannot be opened\n",
|
|
s->bitmap_file);
|
|
goto abort_locked;
|
|
}
|
|
diff --git a/Grow.c b/Grow.c
|
|
index 363b209..6d32661 100644
|
|
--- a/Grow.c
|
|
+++ b/Grow.c
|
|
@@ -446,7 +446,7 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s)
|
|
if (offset_setable) {
|
|
st->ss->getinfo_super(st, mdi, NULL);
|
|
if (sysfs_init(mdi, fd, NULL)) {
|
|
- pr_err("failed to intialize sysfs.\n");
|
|
+ pr_err("failed to initialize sysfs.\n");
|
|
free(mdi);
|
|
}
|
|
rv = sysfs_set_num_signed(mdi, NULL, "bitmap/location",
|
|
@@ -2178,7 +2178,7 @@ size_change_error:
|
|
memset(&info, 0, sizeof(info));
|
|
info.array = array;
|
|
if (sysfs_init(&info, fd, NULL)) {
|
|
- pr_err("failed to intialize sysfs.\n");
|
|
+ pr_err("failed to initialize sysfs.\n");
|
|
rv = 1;
|
|
goto release;
|
|
}
|
|
@@ -2903,7 +2903,7 @@ static int impose_level(int fd, int level, char *devname, int verbose)
|
|
struct mdinfo info;
|
|
|
|
if (sysfs_init(&info, fd, NULL)) {
|
|
- pr_err("failed to intialize sysfs.\n");
|
|
+ pr_err("failed to initialize sysfs.\n");
|
|
return 1;
|
|
}
|
|
|
|
diff --git a/super-ddf.c b/super-ddf.c
|
|
index 618542c..c095e8a 100644
|
|
--- a/super-ddf.c
|
|
+++ b/super-ddf.c
|
|
@@ -1900,7 +1900,7 @@ static struct vd_config *find_vdcr(struct ddf_super *ddf, unsigned int inst,
|
|
return conf;
|
|
}
|
|
bad:
|
|
- pr_err("Could't find disk %d in array %u\n", n, inst);
|
|
+ pr_err("Couldn't find disk %d in array %u\n", n, inst);
|
|
return NULL;
|
|
}
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index 1cc7d5f..c399433 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -10034,7 +10034,7 @@ static void imsm_process_update(struct supertype *st,
|
|
break;
|
|
}
|
|
default:
|
|
- pr_err("error: unsuported process update type:(type: %d)\n", type);
|
|
+ pr_err("error: unsupported process update type:(type: %d)\n", type);
|
|
}
|
|
}
|
|
|
|
--
|
|
2.25.0
|
|
|