[libmultipath] don't trust the path wwid from cache if pathinfo() fails

This kept the reduced map from loading when multipathd runs and a path
is failed or offline.

Also fix get_claimed() false positive returns by checking errno == EBUSY

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 449a25391d3db6b9ced4c0af7e1dbd15299877b6..3558b00d279f5c86000d60c195d2691a18248e9b 100644 (file)
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -225,7 +225,7 @@ get_claimed(char * devname)
 {
        int fd = opennode(devname, O_EXCL);
 
-       if (fd < 0)
+       if (fd <= 0 && errno == EBUSY)
                return 1;
 
        close(fd);
@@ -670,8 +670,9 @@ pathinfo (struct path *pp, vector hwtable, int mask)
 out:
        /*
         * Recoverable error, for example faulty or offline path
-        * Force path state to "failed"
+        * Set up safe defaults, don't trust the cache
         */
+       memset(pp->wwid, 0, WWID_SIZE);
        pp->state = PATH_DOWN;
        return 0;
 }