|
 |
2c1b57 |
From 8e5b52cdda95965787e2a289c855a4ab7099f00d Mon Sep 17 00:00:00 2001
|
|
|
2c1b57 |
From: NeilBrown <neilb@suse.com>
|
|
|
2c1b57 |
Date: Fri, 4 Aug 2017 15:30:02 +1000
|
|
|
2c1b57 |
Subject: [RHEL7.5 PATCH 164/169] Error messages should end with a newline
|
|
|
2c1b57 |
character.
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Add "\n" to the end of error messages which don't already
|
|
|
2c1b57 |
have one. Also spell "opened" correctly.
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Signed-off-by: NeilBrown <neilb@suse.com>
|
|
|
2c1b57 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
2c1b57 |
---
|
|
|
2c1b57 |
Build.c | 4 ++--
|
|
|
2c1b57 |
Grow.c | 4 ++--
|
|
|
2c1b57 |
Manage.c | 2 +-
|
|
|
2c1b57 |
mdopen.c | 2 +-
|
|
|
2c1b57 |
4 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
2c1b57 |
|
|
|
2c1b57 |
diff --git a/Build.c b/Build.c
|
|
|
2c1b57 |
index 70ba068..962c2e3 100644
|
|
|
2c1b57 |
--- a/Build.c
|
|
|
2c1b57 |
+++ b/Build.c
|
|
|
2c1b57 |
@@ -181,7 +181,7 @@ int Build(char *mddev, struct mddev_dev *devlist,
|
|
|
2c1b57 |
int major = BITMAP_MAJOR_HI;
|
|
|
2c1b57 |
#if 0
|
|
|
2c1b57 |
if (s->bitmap_chunk == UnSet) {
|
|
|
2c1b57 |
- pr_err("%s cannot be openned.", s->bitmap_file);
|
|
|
2c1b57 |
+ pr_err("%s cannot be opened.\n", s->bitmap_file);
|
|
|
2c1b57 |
goto abort;
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
#endif
|
|
|
2c1b57 |
@@ -193,7 +193,7 @@ int Build(char *mddev, struct mddev_dev *devlist,
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
bitmap_fd = open(s->bitmap_file, O_RDWR);
|
|
|
2c1b57 |
if (bitmap_fd < 0) {
|
|
|
2c1b57 |
- pr_err("%s cannot be openned.", s->bitmap_file);
|
|
|
2c1b57 |
+ pr_err("%s cannot be opened.\n", s->bitmap_file);
|
|
|
2c1b57 |
goto abort;
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
diff --git a/Grow.c b/Grow.c
|
|
|
2c1b57 |
index b1cb306..534ba80 100644
|
|
|
2c1b57 |
--- a/Grow.c
|
|
|
2c1b57 |
+++ b/Grow.c
|
|
|
2c1b57 |
@@ -3202,7 +3202,7 @@ static int reshape_array(char *container, int fd, char *devname,
|
|
|
2c1b57 |
|
|
|
2c1b57 |
if (info2) {
|
|
|
2c1b57 |
if (sysfs_init(info2, fd, st->devnm)) {
|
|
|
2c1b57 |
- pr_err("unable to initialize sysfs for %s",
|
|
|
2c1b57 |
+ pr_err("unable to initialize sysfs for %s\n",
|
|
|
2c1b57 |
st->devnm);
|
|
|
2c1b57 |
free(info2);
|
|
|
2c1b57 |
goto release;
|
|
|
2c1b57 |
@@ -5146,7 +5146,7 @@ int Grow_continue_command(char *devname, int fd,
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
|
|
|
2c1b57 |
if (sysfs_init(content, fd2, mdstat->devnm)) {
|
|
|
2c1b57 |
- pr_err("Unable to initialize sysfs for %s, Grow cannot continue",
|
|
|
2c1b57 |
+ pr_err("Unable to initialize sysfs for %s, Grow cannot continue.\n",
|
|
|
2c1b57 |
mdstat->devnm);
|
|
|
2c1b57 |
ret_val = 1;
|
|
|
2c1b57 |
close(fd2);
|
|
|
2c1b57 |
diff --git a/Manage.c b/Manage.c
|
|
|
2c1b57 |
index b82a729..871d342 100644
|
|
|
2c1b57 |
--- a/Manage.c
|
|
|
2c1b57 |
+++ b/Manage.c
|
|
|
2c1b57 |
@@ -1417,7 +1417,7 @@ int Manage_subdevs(char *devname, int fd,
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
add_devlist = conf_get_devs();
|
|
|
2c1b57 |
if (add_devlist == NULL) {
|
|
|
2c1b57 |
- pr_err("no devices to scan for missing members.");
|
|
|
2c1b57 |
+ pr_err("no devices to scan for missing members.\n");
|
|
|
2c1b57 |
continue;
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
for (dp = &add_devlist; *dp; dp = & (*dp)->next)
|
|
|
2c1b57 |
diff --git a/mdopen.c b/mdopen.c
|
|
|
2c1b57 |
index c4f1c12..3c0052f 100644
|
|
|
2c1b57 |
--- a/mdopen.c
|
|
|
2c1b57 |
+++ b/mdopen.c
|
|
|
2c1b57 |
@@ -198,7 +198,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
|
|
|
2c1b57 |
return -1;
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
if (cname[0] == 0) {
|
|
|
2c1b57 |
- pr_err("%s is an invalid name for an md device (empty!).", dev);
|
|
|
2c1b57 |
+ pr_err("%s is an invalid name for an md device (empty!).\n", dev);
|
|
|
2c1b57 |
return -1;
|
|
|
2c1b57 |
}
|
|
|
2c1b57 |
if (num < 0) {
|
|
|
2c1b57 |
--
|
|
|
2c1b57 |
2.7.4
|
|
|
2c1b57 |
|