LU-11279 lod: reset ostlist properly in lod_get_default_lov_striping

[fs/lustre-release.git] / lustre / utils / lustre_lfsck.c

diff --git a/lustre/utils/lustre_lfsck.c b/lustre/utils/lustre_lfsck.c
index 2524f99..972d268 100644 (file)
--- a/lustre/utils/lustre_lfsck.c
+++ b/lustre/utils/lustre_lfsck.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * lustre/utils/lustre_lfsck.c
@@ -87,12 +87,14 @@ struct lfsck_type_name {
        enum lfsck_type  ltn_type;
 };
 
+/* Note types must be in order of increasing value so we can iterate through
+ * this correctly.  See enum lfsck_type for values. LU-9894. */
 static struct lfsck_type_name lfsck_types_names[] = {
-       { .ltn_name = "all",            .ltn_type = LFSCK_TYPES_SUPPORTED },
-       { .ltn_name = "default",        .ltn_type = LFSCK_TYPES_DEF },
        { .ltn_name = "layout",         .ltn_type = LFSCK_TYPE_LAYOUT },
        { .ltn_name = "namespace",      .ltn_type = LFSCK_TYPE_NAMESPACE },
        { .ltn_name = "scrub",          .ltn_type = LFSCK_TYPE_SCRUB },
+       { .ltn_name = "all",            .ltn_type = LFSCK_TYPES_SUPPORTED },
+       { .ltn_name = "default",        .ltn_type = LFSCK_TYPES_DEF },
        { .ltn_name = NULL } };
 
 static enum lfsck_type lfsck_name2type(const char *name)
@@ -434,7 +436,7 @@ bad_type:
        data.ioc_inlbuf1 = (char *)&start;
        data.ioc_inllen1 = sizeof(start);
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc != 0) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -446,7 +448,7 @@ bad_type:
                return rc;
        }
 
-       obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
        printf("Started LFSCK on the device %s: scrub", device);
        for (i = 0; lfsck_types_names[i].ltn_name != NULL; i++) {
                if (start.ls_active & lfsck_types_names[i].ltn_type) {
@@ -507,7 +509,7 @@ int jt_lfsck_stop(int argc, char **argv)
        data.ioc_inlbuf1 = (char *)&stop;
        data.ioc_inllen1 = sizeof(stop);
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc != 0) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -584,7 +586,7 @@ bad_type:
        data.ioc_inlbuf1 = (char *)&query;
        data.ioc_inllen1 = sizeof(query);
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc != 0) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -596,7 +598,7 @@ bad_type:
                return rc;
        }
 
-       obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
        for (i = 0, type = 1 << i; i < LFSCK_TYPE_BITS; i++, type = 1 << i) {
                const char *name;
                int j;