[libmultipath] 0 _is_ a valid file descriptor

Stefan Bader, IBM

diff --git a/libmultipath/cache.c b/libmultipath/cache.c
index 81fc613..342f736 100644 (file)
--- a/libmultipath/cache.c
+++ b/libmultipath/cache.c
@@ -12,7 +12,7 @@ static void
 revoke_cache_info(struct path * pp)
 {
        pp->checker_context = NULL;
-       pp->fd = 0;
+       pp->fd = -1;
        pp->mpp = NULL;
        pp->getuid = NULL;
        pp->getprio = NULL;

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index e295eae..cc08d1a 100644 (file)
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -228,7 +228,7 @@ get_claimed(char * devname)
 {
        int fd = opennode(devname, O_EXCL);
 
-       if (fd <= 0 && errno == EBUSY)
+       if (fd < 0 && errno == EBUSY)
                return 1;
 
        close(fd);
@@ -604,10 +604,10 @@ pathinfo (struct path *pp, vector hwtable, int mask)
                pp->claimed = get_claimed(pp->dev);
                condlog(3, "claimed = %i", pp->claimed);
        }
-       if (pp->fd <= 0)
+       if (pp->fd < 0)
                pp->fd = opennode(pp->dev, O_RDONLY);
 
-       if (pp->fd <= 0)
+       if (pp->fd < 0)
                goto out;
 
        if (pp->bus == SYSFS_BUS_SCSI &&

diff --git a/libmultipath/structs.c b/libmultipath/structs.c
index 4c26986..1c70423 100644 (file)
--- a/libmultipath/structs.c
+++ b/libmultipath/structs.c
@@ -33,7 +33,7 @@ free_path (struct path * pp)
        if (pp->checker_context)
                free(pp->checker_context);
 
-       if (pp->fd > 0)
+       if (pp->fd >= 0)
                close(pp->fd);
 
        FREE(pp);