* GPL HEADER END
*/
/*
- * Copyright (c) 2011 Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* lustre/utils/lustre_lfsck.c
{0, 0, 0, 0}
};
-struct lfsck_types_names {
- char *name;
- __u16 type;
+struct lfsck_type_name {
+ char *name;
+ int namelen;
+ enum lfsck_type type;
};
-static struct lfsck_types_names lfsck_types_names[3] = {
- { "layout", LT_LAYOUT },
- { "DNE", LT_DNE },
- { 0, 0 }
+static struct lfsck_type_name lfsck_types_names[] = {
+ { "layout", 6, LT_LAYOUT },
+ { "DNE", 3, LT_DNE },
+ { "namespace", 9, LT_NAMESPACE},
+ { 0, 0, 0 }
};
+static inline int lfsck_name2type(const char *name, int namelen)
+{
+ int i = 0;
+
+ while (lfsck_types_names[i].name != NULL) {
+ if (namelen == lfsck_types_names[i].namelen &&
+ strncmp(lfsck_types_names[i].name, name, namelen) == 0)
+ return lfsck_types_names[i].type;
+ i++;
+ }
+ return 0;
+}
+
static void usage_start(void)
{
fprintf(stderr, "Start LFSCK.\n"
"-h: Help information.\n");
}
+static int lfsck_pack_dev(struct obd_ioctl_data *data, char *device, char *arg)
+{
+ int len = strlen(arg) + 1;
+
+ if (len > MAX_OBD_NAME) {
+ fprintf(stderr, "MDT device name is too long. "
+ "Valid length should be less than %d\n", MAX_OBD_NAME);
+ return -EINVAL;
+ }
+
+ memcpy(device, arg, len);
+ data->ioc_inlbuf4 = device;
+ data->ioc_inllen4 = len;
+ data->ioc_dev = OBD_DEV_BY_DEVNAME;
+ return 0;
+}
+
int jt_lfsck_start(int argc, char **argv)
{
struct obd_ioctl_data data;
char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
char device[MAX_OBD_NAME];
struct lfsck_start start;
- char *optstring = "M:e:hi:n:rs:t:";
- int opt, index, rc, val, i;
+ char *optstring = "M:e:hn:rs:t:";
+ int opt, index, rc, val, i, type;
memset(&data, 0, sizeof(data));
memset(&start, 0, sizeof(start));
+ memset(device, 0, MAX_OBD_NAME);
start.ls_version = LFSCK_VERSION_V1;
start.ls_active = LFSCK_TYPES_DEF;
+
+ /* Reset the 'optind' for the case of getopt_long() called multiple
+ * times under the same lctl. */
+ optind = 0;
while ((opt = getopt_long(argc, argv, optstring, long_opt_start,
&index)) != EOF) {
switch (opt) {
case 'M':
- data.ioc_inllen4 = strlen(optarg) + 1;
- if (data.ioc_inllen4 > MAX_OBD_NAME) {
- fprintf(stderr, "MDT device name is too long. "
- "Valid length should be less than %d\n",
- MAX_OBD_NAME);
- return -EINVAL;
- }
-
- data.ioc_inlbuf4 = optarg;
- data.ioc_dev = OBD_DEV_BY_DEVNAME;
+ rc = lfsck_pack_dev(&data, device, optarg);
+ if (rc != 0)
+ return rc;
break;
case 'e':
if (strcmp(optarg, "abort") == 0) {
c = *p;
*p = 0;
- for (i = 0; i < 3; i++) {
- if (strcmp(str,
- lfsck_types_names[i].name)
- == 0) {
- start.ls_active |=
- lfsck_types_names[i].type;
- break;
- }
+ type = lfsck_name2type(str, strlen(str));
+ if (type == 0) {
+ fprintf(stderr, "Invalid type (%s).\n"
+ "The valid value should be "
+ "'layout', 'DNE' or "
+ "'namespace'.\n", str);
+ *p = c;
+ return -EINVAL;
}
+
*p = c;
str = p;
- if (i >= 3 ) {
- fprintf(stderr, "Invalid LFSCK type.\n"
- "The valid value should be "
- "'layout' or 'DNE'.\n");
- return -EINVAL;
- }
+ start.ls_active |= type;
}
if (start.ls_active == 0) {
fprintf(stderr, "Miss LFSCK type(s).\n"
"The valid value should be "
- "'layout' or 'DNE'.\n");
+ "'layout', 'DNE' or 'namespace'.\n");
return -EINVAL;
}
break;
return -EINVAL;
}
- memset(device, 0, MAX_OBD_NAME);
- memcpy(device, data.ioc_inlbuf4, data.ioc_inllen4);
- data.ioc_inlbuf4 = device;
data.ioc_inlbuf1 = (char *)&start;
data.ioc_inllen1 = sizeof(start);
memset(buf, 0, sizeof(rawbuf));
}
obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
- printf("Started LFSCK on the MDT device %s:", device);
if (start.ls_active == 0) {
- printf(" noop");
+ printf("Started LFSCK on the MDT device %s", device);
} else {
- for (i = 0; i < 2; i++) {
+ printf("Started LFSCK on the MDT device %s:", device);
+ i = 0;
+ while (lfsck_types_names[i].name != NULL) {
if (start.ls_active & lfsck_types_names[i].type) {
printf(" %s", lfsck_types_names[i].name);
start.ls_active &= ~lfsck_types_names[i].type;
}
+ i++;
}
if (start.ls_active != 0)
printf(" unknown(0x%x)", start.ls_active);
}
- printf("\n");
+ printf(".\n");
return 0;
}
int opt, index, rc;
memset(&data, 0, sizeof(data));
+ memset(device, 0, MAX_OBD_NAME);
+
+ /* Reset the 'optind' for the case of getopt_long() called multiple
+ * times under the same lctl. */
+ optind = 0;
while ((opt = getopt_long(argc, argv, optstring, long_opt_stop,
&index)) != EOF) {
switch (opt) {
case 'M':
- data.ioc_inllen4 = strlen(optarg) + 1;
- if (data.ioc_inllen4 > MAX_OBD_NAME) {
- fprintf(stderr, "MDT device name is too long. "
- "Valid length should be less than %d\n",
- MAX_OBD_NAME);
- return -EINVAL;
- }
-
- data.ioc_inlbuf4 = optarg;
- data.ioc_dev = OBD_DEV_BY_DEVNAME;
+ rc = lfsck_pack_dev(&data, device, optarg);
+ if (rc != 0)
+ return rc;
break;
case 'h':
usage_stop();
return -EINVAL;
}
- memset(device, 0, MAX_OBD_NAME);
- memcpy(device, data.ioc_inlbuf4, data.ioc_inllen4);
- data.ioc_inlbuf4 = device;
memset(buf, 0, sizeof(rawbuf));
rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
if (rc) {