X-Git-Url: https://git.whamcloud.com/gitweb?a=blobdiff_plain;f=lustre%2Futils%2Fliblustreapi.c;h=0f85d294b7891abcb953eb6b833b6b1d16b602ae;hb=0f38a0b9db4f7c6c101ee55fe7b94d49a32eabe9;hp=d042424c406e4ded81d96ce13af510a025ef3354;hpb=e11deeb1e6d114608eac4ee998d4cea22e30b0f5;p=fs%2Flustre-release.git diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c index d042424..0f85d29 100644 --- a/lustre/utils/liblustreapi.c +++ b/lustre/utils/liblustreapi.c @@ -2310,23 +2310,29 @@ out: int llapi_file_fget_lov_uuid(int fd, struct obd_uuid *lov_name) { - int rc = ioctl(fd, OBD_IOC_GETNAME, lov_name); + int rc; + rc = ioctl(fd, OBD_IOC_GETDTNAME, lov_name); + if (rc && errno == ENOTTY) + rc = ioctl(fd, OBD_IOC_GETNAME_OLD, lov_name); if (rc) { rc = -errno; llapi_error(LLAPI_MSG_ERROR, rc, "cannot get lov name"); } + return rc; } int llapi_file_fget_lmv_uuid(int fd, struct obd_uuid *lov_name) { - int rc = ioctl(fd, OBD_IOC_GETMDNAME, lov_name); + int rc; + rc = ioctl(fd, OBD_IOC_GETMDNAME, lov_name); if (rc) { rc = -errno; llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get lmv name."); } + return rc; }