Branch b1_6

Return errors from ioctl(), unlike setup_obd_uuids().
b=11757
i=kalpak

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index efb90e1..7fafd6f 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -182,12 +182,8 @@ int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
         /* Get the lov name */
         rc = ioctl(fd, OBD_IOC_GETNAME, (void *) lov_name);
         if (rc) {
-                if (errno != ENOTTY) {
-                        rc = errno;
-                        err_msg("error: can't get lov name.");
-                } else {
-                        rc = 0;
-                }
+                rc = errno;
+                err_msg("error: can't get lov name.");
                 return rc;
         }