Add gpt pseudo-metadata

[thirdparty/mdadm.git] / msg.c

diff --git a/msg.c b/msg.c
index 5a4839fad7bf40e6fadd745b7228e15b3df1204e..aabfa8f566072b64d900b91c8e50cfaf0fde0057 100644 (file)
--- a/msg.c
+++ b/msg.c
@@ -147,7 +147,7 @@ int connect_monitor(char *devname)
        int pos;
        char *c;
 
-       pos = sprintf(path, "/var/run/mdadm/");
+       pos = sprintf(path, "%s/", MDMON_DIR);
        if (is_subarray(devname)) {
                devname++;
                c = strchr(devname, '/');
@@ -177,10 +177,8 @@ int connect_monitor(char *devname)
        return sfd;
 }
 
-/* give the monitor a chance to update the metadata */
-int ping_monitor(char *devname)
+int fping_monitor(int sfd)
 {
-       int sfd = connect_monitor(devname);
        int err = 0;
 
        if (sfd < 0)
@@ -194,6 +192,16 @@ int ping_monitor(char *devname)
        if (!err && wait_reply(sfd, 20) != 0)
                err = -1;
 
+       return err;
+}
+
+
+/* give the monitor a chance to update the metadata */
+int ping_monitor(char *devname)
+{
+       int sfd = connect_monitor(devname);
+       int err = fping_monitor(sfd);
+
        close(sfd);
        return err;
 }