]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
mdadm: Introduce pr_info()
authorLogan Gunthorpe <logang@deltatee.com>
Wed, 1 Mar 2023 20:41:32 +0000 (13:41 -0700)
committerJes Sorensen <jes@trained-monkey.org>
Mon, 13 Mar 2023 14:08:10 +0000 (10:08 -0400)
Feedback was given to avoid informational pr_err() calls that print
to stderr, even though that's done all through out the code.

Using printf() directly doesn't maintain the same format (an "mdadm"
prefix on every line.

So introduce pr_info() which prints to stdout with the same format
and use it for a couple informational pr_err() calls in Create().

Future work can make this call used in more cases.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Kinga Tanska <kinga.tanska@linux.intel.com>
Reviewed-by: Xiao Ni <xni@redhat.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Acked-by: Coly Li <colyli@suse.de>
Acked-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
Create.c
mdadm.h

index 6a0446644e04377e622016f0ad0f3a1a29c6753c..4acda30c5256f7e0df4fea0ffd1392596cc87168 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -984,11 +984,12 @@ int Create(struct supertype *st, char *mddev,
 
                        mdi = sysfs_read(-1, devnm, GET_VERSION);
 
-                       pr_err("Creating array inside %s container %s\n",
+                       pr_info("Creating array inside %s container %s\n",
                                mdi?mdi->text_version:"managed", devnm);
                        sysfs_free(mdi);
                } else
-                       pr_err("Defaulting to version %s metadata\n", info.text_version);
+                       pr_info("Defaulting to version %s metadata\n",
+                               info.text_version);
        }
 
        map_update(&map, fd2devnm(mdfd), info.text_version,
@@ -1145,7 +1146,7 @@ int Create(struct supertype *st, char *mddev,
                        ioctl(mdfd, RESTART_ARRAY_RW, NULL);
                }
                if (c->verbose >= 0)
-                       pr_err("array %s started.\n", mddev);
+                       pr_info("array %s started.\n", mddev);
                if (st->ss->external && st->container_devnm[0]) {
                        if (need_mdmon)
                                start_mdmon(st->container_devnm);
diff --git a/mdadm.h b/mdadm.h
index 1674ce1307b2455c3fde644880d74ee06a10603f..4336be4dad82a8a09eea755664e8108c552a172e 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -1854,6 +1854,8 @@ static inline int xasprintf(char **strp, const char *fmt, ...) {
 #endif
 #define cont_err(fmt ...) fprintf(stderr, "       " fmt)
 
+#define pr_info(fmt, args...) printf("%s: "fmt, Name, ##args)
+
 void *xmalloc(size_t len);
 void *xrealloc(void *ptr, size_t len);
 void *xcalloc(size_t num, size_t size);