From c791db551d022cd804e9dcc751cd7e33102a741a Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Thu, 20 Oct 2016 09:47:00 -0500 Subject: [PATCH] LU-8723 llapi: correct open() handling in llapi_obd_statfs() In llapi_obd_statfs() remove a spurious errno test and retry after open(). Signed-off-by: John L. Hammond Change-Id: I1667f1f0acf0e1f0d700049bc39a5e6c462b9df6 Reviewed-on: http://review.whamcloud.com/23285 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Dmitry Eremin --- lustre/utils/liblustreapi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c index 820d28d..07c24ba 100644 --- a/lustre/utils/liblustreapi.c +++ b/lustre/utils/liblustreapi.c @@ -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 -- 1.8.3.1