Whamcloud - gitweb
LU-8723 llapi: correct open() handling in llapi_obd_statfs() 85/23285/3
authorJohn L. Hammond <john.hammond@intel.com>
Thu, 20 Oct 2016 14:47:00 +0000 (09:47 -0500)
committerOleg Drokin <oleg.drokin@intel.com>
Fri, 28 Oct 2016 23:50:35 +0000 (23:50 +0000)
In llapi_obd_statfs() remove a spurious errno test and retry after
open().

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I1667f1f0acf0e1f0d700049bc39a5e6c462b9df6
Reviewed-on: http://review.whamcloud.com/23285
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
lustre/utils/liblustreapi.c

index 820d28d..07c24ba 100644 (file)
@@ -3382,12 +3382,9 @@ int llapi_obd_statfs(char *path, __u32 type, __u32 index,
                 return rc;
         }
 
-        fd = open(path, O_RDONLY);
-        if (errno == EISDIR)
-                fd = open(path, O_DIRECTORY | O_RDONLY);
-
+       fd = open(path, O_RDONLY);
        if (fd < 0) {
-               rc = errno ? -errno : -EBADF;
+               rc = -errno;
                llapi_error(LLAPI_MSG_ERROR, rc, "error: %s: opening '%s'",
                            __func__, path);
                /* If we can't even open a file on the filesystem (e.g. with