#define MAX_THREADS 4096
#define MAX_BASE_ID 0xffffffff
+#define NIDSTRING_LENGTH 64
struct shared_data {
l_mutex_t mutex;
l_cond_t cond;
rc = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
if (rc != 0) {
fprintf(stderr, "Can't set shared mutex attr\n");
- return rc;
+ goto out;
}
rc = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
if (rc != 0) {
fprintf(stderr, "Can't set shared cond attr\n");
- return rc;
+ goto out;
}
pthread_mutex_init(&shared_data->mutex, &mattr);
pthread_cond_init(&shared_data->cond, &cattr);
-
+out:
pthread_mutexattr_destroy(&mattr);
pthread_condattr_destroy(&cattr);
- return 0;
+ return rc;
}
static inline void shmem_lock(void)
sprintf(dirname, "%s", "/");
name++;
} else {
- int namelen = (unsigned long)last_lash -
- (unsigned long)name;
- snprintf(dirname, namelen, "%s", name);
- }
+ int namelen = (unsigned long)last_lash -
+ (unsigned long)name + 1;
+ snprintf(dirname, namelen, "%s", name);
+ name = last_lash + 1;
+ }
data.ioc_pbuf1 = dirname;
data.ioc_plen1 = strlen(dirname);
if (name != NULL) {
data.ioc_pbuf2 = name;
data.ioc_plen2 = strlen(name);
- } else {
- if (parent_base_id > 0)
- sprintf(dirname, "%s%d", parent_basedir,
- parent_base_id);
- else
- sprintf(dirname, "%s", parent_basedir);
}
+ if (parent_base_id > 0)
+ sprintf(dirname, "%s%d", parent_basedir,
+ parent_base_id);
+ else
+ sprintf(dirname, "%s", parent_basedir);
data.ioc_pbuf1 = dirname;
data.ioc_plen1 = strlen(dirname);
}
while (shmem_running()) {
struct lu_fid fid = { 0 };
- ostid_set_id(&data.ioc_obdo2.o_oi, child_base_id);
+ if (child_base_id != -1)
+ data.ioc_obdo2.o_oi.oi.oi_id = child_base_id;
data.ioc_obdo2.o_mode = mode | create_mode;
data.ioc_obdo2.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE |
OBD_MD_FLMODE | OBD_MD_FLFLAGS |
return rc;
}
-int jt_llog_cancel(int argc, char **argv)
+static int llog_cancel_parse_optional(int argc, char **argv,
+ struct obd_ioctl_data *data)
{
- struct obd_ioctl_data data;
- char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
- int rc;
+ int cOpt;
+ const char *const short_options = "c:l:i:h";
+ const struct option long_options[] = {
+ {"catalog", required_argument, NULL, 'c'},
+ {"log_id", required_argument, NULL, 'l'},
+ {"log_idx", required_argument, NULL, 'i'},
+ {"help", no_argument, NULL, 'h'},
+ {NULL, 0, NULL, 0}
+ };
+
+ /* sanity check */
+ if (!data || argc <= 1) {
+ return -1;
+ }
- if (argc != 4)
- return CMD_HELP;
+ /*now process command line arguments*/
+ while ((cOpt = getopt_long(argc, argv, short_options,
+ long_options, NULL)) != -1) {
+ switch (cOpt) {
+ case 'c':
+ data->ioc_inllen1 = strlen(optarg) + 1;
+ data->ioc_inlbuf1 = optarg;
+ break;
- memset(&data, 0, sizeof(data));
- data.ioc_dev = cur_device;
- data.ioc_inllen1 = strlen(argv[1]) + 1;
- data.ioc_inlbuf1 = argv[1];
- data.ioc_inllen2 = strlen(argv[2]) + 1;
- data.ioc_inlbuf2 = argv[2];
- data.ioc_inllen3 = strlen(argv[3]) + 1;
- data.ioc_inlbuf3 = argv[3];
- memset(buf, 0, sizeof(rawbuf));
- rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
- if (rc) {
- fprintf(stderr, "error: %s: invalid ioctl\n",
- jt_cmdname(argv[0]));
- return rc;
- }
+ case 'l':
+ data->ioc_inllen2 = strlen(optarg) + 1;
+ data->ioc_inlbuf2 = optarg;
+ break;
- rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CANCEL, buf);
- if (rc == 0)
- fprintf(stdout, "index %s be canceled.\n", argv[3]);
- else
- fprintf(stderr, "OBD_IOC_LLOG_CANCEL failed: %s\n",
- strerror(errno));
+ case 'i':
+ data->ioc_inllen3 = strlen(optarg) + 1;
+ data->ioc_inlbuf3 = optarg;
+ break;
- return rc;
+ case 'h':
+ default:
+ return -1;
+ }
+ }
+ if ((data->ioc_inlbuf1 == NULL) || (data->ioc_inlbuf3 == NULL)) {
+ /* missing mandatory parameters */
+ return -1;
+ }
+
+ return 0;
+}
+
+int jt_llog_cancel(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+ int rc, i;
+
+ /* check that the arguments provided are either all
+ * optional or all positional. No mixing allowed
+ *
+ * if argc is 4 or 3 then check all arguments to ensure that none
+ * of them start with a '-'. If so then this is invalid.
+ * Otherwise if arg is > 4 then assume that this is optional
+ * arguments, and parse as such ignoring any thing that's not
+ * optional. The result is that user must use optional arguments
+ * for all mandatory parameters. Code will ignore all other args
+ *
+ * The positional arguments option should eventually be phased out.
+ */
+ memset(&data, 0, sizeof(data));
+ data.ioc_dev = cur_device;
+
+ if (argc == 3 || argc == 4) {
+ for (i = 1; i < argc; i++) {
+ if (argv[i][0] == '-')
+ return CMD_HELP;
+ }
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
+ data.ioc_inlbuf1 = argv[1];
+ if (argc == 4) {
+ data.ioc_inllen2 = strlen(argv[2]) + 1;
+ data.ioc_inlbuf2 = argv[2];
+ data.ioc_inllen3 = strlen(argv[3]) + 1;
+ data.ioc_inlbuf3 = argv[3];
+ } else {
+ data.ioc_inllen3 = strlen(argv[2]) + 1;
+ data.ioc_inlbuf3 = argv[2];
+ }
+ } else {
+ if (llog_cancel_parse_optional(argc, argv, &data) != 0)
+ return CMD_HELP;
+ }
+
+ memset(buf, 0, sizeof(rawbuf));
+ rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+ if (rc) {
+ fprintf(stderr, "error: %s: invalid ioctl\n",
+ jt_cmdname(argv[0]));
+ return rc;
+ }
+
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_CANCEL, buf);
+ if (rc == 0)
+ fprintf(stdout, "index %s was canceled.\n",
+ argc == 4 ? argv[3] : argv[2]);
+ else
+ fprintf(stderr, "OBD_IOC_LLOG_CANCEL failed: %s\n",
+ strerror(errno));
+
+ return rc;
}
+
int jt_llog_check(int argc, char **argv)
{
struct obd_ioctl_data data;
rc = l_ioctl(OBD_DEV_ID, OBD_IOC_LLOG_REMOVE, buf);
if (rc == 0) {
- if (argc == 3)
- fprintf(stdout, "log %s are removed.\n", argv[2]);
- else
- fprintf(stdout, "the log in catalog %s are removed. \n", argv[1]);
+ if (argc == 2)
+ fprintf(stdout, "log %s is removed.\n", argv[1]);
+ else
+ fprintf(stdout, "the log in catalog %s is removed. \n",
+ argv[1]);
} else
fprintf(stderr, "OBD_IOC_LLOG_REMOVE failed: %s\n",
strerror(errno));
FILE *fp;
int found = 0;
char buf[1024];
+ char *ptr;
fp = fopen("/proc/modules", "r");
if (fp == NULL)
return -1;
while (fgets(buf, 1024, fp) != NULL) {
- *strchr(buf, ' ') = 0;
+ ptr = strchr(buf, ' ');
+ if (ptr != NULL)
+ *ptr = 0;
if (strcmp(module, buf) == 0) {
found = 1;
break;
ostname, fsname);
return -EINVAL;
} else {
- strcpy(real_ostname, ostname);
+ if (strlen(ostname) > sizeof(real_ostname)-1)
+ return -E2BIG;
+ strncpy(real_ostname, ostname, sizeof(real_ostname));
}
/* real_ostname is fsname-????? */
ptr = real_ostname + strlen(fsname) + 1;
return rc;
}
+/**
+ * Format and send the ioctl to the MGS.
+ *
+ * \param cmd IOCTL to send
+ * \param ret_data void pointer to return anything from
+ * ioctl
+ * \param num_args number of arguments to pack into the
+ * ioctl buffer
+ * \param argv[] variable number of string arguments
+ *
+ * \retval 0 on success
+ */
+static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data,
+ unsigned int ret_size, ...)
+{
+ va_list ap;
+ char *arg;
+ int i = 0;
+ struct lustre_cfg_bufs bufs;
+ struct obd_ioctl_data data;
+ struct lustre_cfg *lcfg;
+ char rawbuf[MAX_IOC_BUFLEN];
+ char *buf = rawbuf;
+ int rc = 0;
+
+ lustre_cfg_bufs_reset(&bufs, NULL);
+
+ va_start(ap, ret_size);
+ arg = va_arg(ap, char *);
+ while (arg != NULL) {
+ lustre_cfg_bufs_set_string(&bufs, i, arg);
+ i++;
+ arg = va_arg(ap, char *);
+ }
+ va_end(ap);
+
+ lcfg = lustre_cfg_new(cmd, &bufs);
+
+ if (IS_ERR(lcfg)) {
+ rc = PTR_ERR(lcfg);
+ return rc;
+ }
+
+ memset(&data, 0, sizeof(data));
+ rc = data.ioc_dev = get_mgs_device();
+ if (rc < 0)
+ goto out;
+
+ data.ioc_type = LUSTRE_CFG_TYPE;
+ data.ioc_plen1 = lustre_cfg_len(lcfg->lcfg_bufcount,
+ lcfg->lcfg_buflens);
+ data.ioc_pbuf1 = (void *)lcfg;
+
+ memset(buf, 0, sizeof(rawbuf));
+ rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+ if (rc != 0) {
+ fprintf(stderr, "error: invalid ioctl: %08x errno: %d with "
+ "rc=%d\n", cmd, errno, rc);
+ goto out;
+ }
+
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_NODEMAP, buf);
+ if (rc != 0) {
+ fprintf(stderr, "error: invalid ioctl: %08x errno: %d with "
+ "rc=%d\n", cmd, errno, rc);
+ goto out;
+ }
+
+ if (ret_data != NULL) {
+ rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+ if (rc != 0)
+ goto out;
+
+ memcpy(ret_data, data.ioc_pbuf1, data.ioc_plen1);
+ if (ret_data == NULL || sizeof(ret_data) != ret_size)
+ rc = -errno;
+ }
+out:
+ lustre_cfg_free(lcfg);
+
+ return rc;
+}
+
+/**
+ * activate nodemap functions
+ *
+ * \param argc number of args
+ * \param argv[] variable string arguments
+ *
+ * argv[0] 1 for activate or 0 for deactivate
+ *
+ * \retval 0 on success
+ */
+int jt_nodemap_activate(int argc, char **argv)
+{
+ int rc;
+
+ rc = nodemap_cmd(LCFG_NODEMAP_ACTIVATE, NULL, 0, argv[0], argv[1],
+ NULL);
+
+ if (rc != 0) {
+ errno = -rc;
+ perror(argv[0]);
+ }
+
+ return rc;
+}
+
+/**
+ * add a nodemap
+ *
+ * \param argc number of args
+ * \param argv[] variable string arguments
+ *
+ * argv[0] nodemap name
+ *
+ * \retval 0 on success
+ */
+int jt_nodemap_add(int argc, char **argv)
+{
+ int rc;
+
+ rc = llapi_nodemap_exists(argv[1]);
+ if (rc == 0) {
+ fprintf(stderr, "error: %s existing nodemap name\n", argv[1]);
+ return 1;
+ }
+
+ rc = nodemap_cmd(LCFG_NODEMAP_ADD, NULL, 0, argv[0], argv[1], NULL);
+
+ if (rc != 0) {
+ errno = -rc;
+ perror(argv[0]);
+ }
+
+ return rc;
+}
+
+/**
+ * delete a nodemap
+ *
+ * \param argc number of args
+ * \param argv[] variable string arguments
+ *
+ * argv[0] nodemap name
+ *
+ * \retval 0 on success
+ */
+int jt_nodemap_del(int argc, char **argv)
+{
+ int rc;
+
+ rc = llapi_nodemap_exists(argv[1]);
+ if (rc != 0) {
+ fprintf(stderr, "error: %s not existing nodemap name\n",
+ argv[1]);
+ return rc;
+ }
+ rc = nodemap_cmd(LCFG_NODEMAP_DEL, NULL, 0, argv[0], argv[1], NULL);
+
+ if (rc != 0) {
+ errno = -rc;
+ perror(argv[0]);
+ }
+
+ return rc;
+}
+
+/**
+ * test a nid for nodemap membership
+ *
+ * \param argc number of args
+ * \param argv[] variable string arguments
+ *
+ * argv[0] properly formatted nid
+ *
+ * \retval 0 on success
+ */
+int jt_nodemap_test_nid(int argc, char **argv)
+{
+
+ char rawbuf[MAX_IOC_BUFLEN];
+ int rc;
+
+ rc = nodemap_cmd(LCFG_NODEMAP_TEST_NID, &rawbuf, sizeof(rawbuf),
+ argv[0], argv[1], NULL);
+ if (rc == 0)
+ printf("%s\n", (char *)rawbuf);
+
+ return rc;
+}
+
+/**
+ * test a nodemap id pair for mapping
+ *
+ * \param argc number of args
+ * \param argv[[] variable string arguments
+ *
+ * \retval 0 on success
+ *
+ * The argv array should contain the nodemap name, the id
+ * to checking the mapping on, and the id type (UID or GID)
+ *
+ */
+int jt_nodemap_test_id(int argc, char **argv)
+{
+ char rawbuf[MAX_IOC_BUFLEN];
+ char *nidstr = NULL;
+ char *idstr = NULL;
+ char *typestr = NULL;
+ int rc = 0;
+ int c;
+
+ static struct option long_options[] = {
+ {
+ .name = "nid",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'n',
+ },
+ {
+ .name = "idtype",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 't',
+ },
+ {
+ .name = "id",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'i',
+ },
+ {
+ NULL
+ }
+ };
+
+ while ((c = getopt_long(argc, argv, "n:t:i:",
+ long_options, NULL)) != -1) {
+ switch (c) {
+ case 'n':
+ nidstr = optarg;
+ break;
+ case 't':
+ typestr = optarg;
+ break;
+ case 'i':
+ idstr = optarg;
+ break;
+ }
+ }
+
+ if (nidstr == NULL || typestr == NULL || idstr == NULL) {
+ fprintf(stderr, "usage: nodemap_test_id --nid <nid> "
+ "--idtype [uid|gid] --id <id>\n");
+ return -1;
+ }
+
+ rc = nodemap_cmd(LCFG_NODEMAP_TEST_ID, &rawbuf, sizeof(rawbuf),
+ argv[0], nidstr, typestr, idstr);
+ if (rc == 0)
+ printf("%s\n", (char *)rawbuf);
+
+ return rc;
+}
+
+/**
+ * add an nid range to a nodemap
+ *
+ * \param argc number of args
+ * \param argv[] variable string arguments
+ *
+ * --name nodemap name
+ * --range properly formatted nid range
+ *
+ * \retval 0 on success
+ */
+int jt_nodemap_add_range(int argc, char **argv)
+{
+ char *nodemap_name = NULL;
+ char *nodemap_range = NULL;
+ struct list_head nidlist;
+ char min_nid[LNET_NIDSTR_SIZE + 1];
+ char max_nid[LNET_NIDSTR_SIZE + 1];
+ char nid_range[2 * LNET_NIDSTR_SIZE + 2];
+ int rc = 0;
+ int c;
+
+ static struct option long_options[] = {
+ {
+ .name = "name",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'n',
+ },
+ {
+ .name = "range",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'r',
+ },
+ {
+ NULL
+ }
+ };
+
+ INIT_LIST_HEAD(&nidlist);
+
+ while ((c = getopt_long(argc, argv, "n:r:",
+ long_options, NULL)) != -1) {
+ switch (c) {
+ case 'n':
+ nodemap_name = optarg;
+ break;
+ case 'r':
+ nodemap_range = optarg;
+ break;
+ }
+ }
+
+ if (nodemap_name == NULL || nodemap_range == NULL) {
+ fprintf(stderr, "usage: nodemap_add_range --name <name> "
+ "--range <range>\n");
+ return -1;
+ }
+
+ if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range),
+ &nidlist) <= 0) {
+ fprintf(stderr, "error: %s: can't parse nid range: %s\n",
+ jt_cmdname(argv[0]), nodemap_range);
+ return -1;
+ }
+
+ if (!cfs_nidrange_is_contiguous(&nidlist)) {
+ fprintf(stderr, "error: %s: nodemap ranges must be "
+ "contiguous\n", jt_cmdname(argv[0]));
+ return -1;
+ }
+
+ cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+ LNET_NIDSTR_SIZE);
+ snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
+
+ rc = nodemap_cmd(LCFG_NODEMAP_ADD_RANGE, NULL, 0, argv[0],
+ nodemap_name, nid_range, NULL);
+ if (rc != 0) {
+ errno = -rc;
+ fprintf(stderr, "error: %s: cannot add range '%s' to nodemap "
+ "'%s': rc = %d\n",
+ jt_cmdname(argv[0]), nodemap_range, nodemap_name, rc);
+ }
+
+ return rc;
+}
+
+/**
+ * delete an nid range to a nodemap
+ *
+ * \param argc number of args
+ * \param argv[] variable string arguments
+ *
+ * --name nodemap name
+ * --range properly formatted nid range
+ *
+ * \retval 0 on success
+ */
+int jt_nodemap_del_range(int argc, char **argv)
+{
+ char *nodemap_name = NULL;
+ char *nodemap_range = NULL;
+ struct list_head nidlist;
+ char min_nid[LNET_NIDSTR_SIZE + 1];
+ char max_nid[LNET_NIDSTR_SIZE + 1];
+ char nid_range[2 * LNET_NIDSTR_SIZE + 2];
+ int rc = 0;
+ int c;
+
+ static struct option long_options[] = {
+ {
+ .name = "name",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'n',
+ },
+ {
+ .name = "range",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'r',
+ },
+ {
+ NULL
+ }
+ };
+
+ INIT_LIST_HEAD(&nidlist);
+
+ while ((c = getopt_long(argc, argv, "n:r:",
+ long_options, NULL)) != -1) {
+ switch (c) {
+ case 'n':
+ nodemap_name = optarg;
+ break;
+ case 'r':
+ nodemap_range = optarg;
+ break;
+ }
+ }
+
+ if (nodemap_name == NULL || nodemap_range == NULL) {
+ fprintf(stderr, "usage: nodemap_del_range --name <name> "
+ "--range <range>\n");
+ return -1;
+ }
+
+ if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range),
+ &nidlist) <= 0) {
+ fprintf(stderr, "error: %s: can't parse nid range: %s\n",
+ jt_cmdname(argv[0]), nodemap_range);
+ return -1;
+ }
+
+ if (!cfs_nidrange_is_contiguous(&nidlist)) {
+ fprintf(stderr, "error: %s: nodemap ranges must be "
+ "contiguous\n", jt_cmdname(argv[0]));
+ return -1;
+ }
+
+ cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+ LNET_NIDSTR_SIZE);
+ snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
+
+ rc = nodemap_cmd(LCFG_NODEMAP_DEL_RANGE, NULL, 0, argv[0],
+ nodemap_name, nid_range, NULL);
+ if (rc != 0) {
+ errno = -rc;
+ fprintf(stderr, "error: %s: cannot delete range '%s' to "
+ "nodemap '%s': rc = %d\n",
+ jt_cmdname(argv[0]), nodemap_range, nodemap_name, rc);
+ }
+
+ return rc;
+}
+
+/**
+ * modify a nodemap's behavior
+ *
+ * \param argc number of args
+ * \param argv[] variable string arguments
+ *
+ * --name nodemap name
+ * --property nodemap property to change
+ * admin, trusted, squash_uid, squash_gid)
+ * --value value to set property
+ *
+ * \retval 0 on success
+ */
+int jt_nodemap_modify(int argc, char **argv)
+{
+ int c;
+ int rc = 0;
+ enum lcfg_command_type cmd = 0;
+ char *nodemap_name = NULL;
+ char *param = NULL;
+ char *value = NULL;
+
+ static struct option long_options[] = {
+ {
+ .name = "name",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'n',
+ },
+ {
+ .name = "property",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'p',
+ },
+ {
+ .name = "value",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'v',
+ },
+ {
+ NULL
+ }
+ };
+
+ while ((c = getopt_long(argc, argv, "n:p:v:",
+ long_options, NULL)) != -1) {
+ switch (c) {
+ case 'n':
+ nodemap_name = optarg;
+ break;
+ case 'p':
+ param = optarg;
+ break;
+ case 'v':
+ value = optarg;
+ break;
+ }
+ }
+
+ if (nodemap_name == NULL || param == NULL || value == NULL) {
+ fprintf(stderr, "usage: nodemap_modify --name <name> "
+ "--property <range> --value <value>\n");
+ return -1;
+ }
+
+ if (strcmp("admin", param) == 0) {
+ cmd = LCFG_NODEMAP_ADMIN;
+ } else if (strcmp("trusted", param) == 0) {
+ cmd = LCFG_NODEMAP_TRUSTED;
+ } else if (strcmp("squash_uid", param) == 0) {
+ cmd = LCFG_NODEMAP_SQUASH_UID;
+ } else if (strcmp("squash_gid", param) == 0) {
+ cmd = LCFG_NODEMAP_SQUASH_GID;
+ } else {
+ fprintf(stderr, "error: %s: nodemap_modify invalid "
+ "subcommand: %s\n",
+ jt_cmdname(argv[0]), param);
+ return -1;
+ }
+
+ rc = nodemap_cmd(cmd, NULL, 0, argv[0], nodemap_name, param,
+ value, NULL);
+ if (rc != 0) {
+ errno = -rc;
+ fprintf(stderr, "error: %s: cannot modify nodemap '%s' "
+ "to param '%s': value '%s': rc = %d\n",
+ jt_cmdname(argv[0]), nodemap_name, param, value, rc);
+ }
+
+ return rc;
+}
+
+int jt_nodemap_add_idmap(int argc, char **argv)
+{
+ int c;
+ enum lcfg_command_type cmd = 0;
+ char *nodemap_name = NULL;
+ char *idmap = NULL;
+ char *idtype = NULL;
+ int rc = 0;
+
+ static struct option long_options[] = {
+ {
+ .name = "name",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'n',
+ },
+ {
+ .name = "idmap",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'm',
+ },
+ {
+ .name = "idtype",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'i',
+ },
+ {
+ NULL
+ }
+ };
+
+ while ((c = getopt_long(argc, argv, "n:m:i:",
+ long_options, NULL)) != -1) {
+ switch (c) {
+ case 'n':
+ nodemap_name = optarg;
+ break;
+ case 'm':
+ idmap = optarg;
+ break;
+ case 'i':
+ idtype = optarg;
+ break;
+ }
+ }
+
+ if (nodemap_name == NULL || idmap == NULL || idtype == NULL) {
+ fprintf(stderr, "usage: %s --name <name> --idtype [uid | gid]"
+ " --idmap <client id>:<filesystem id>\n", argv[0]);
+ return -1;
+ }
+
+ if (strcmp("uid", idtype) == 0) {
+ cmd = LCFG_NODEMAP_ADD_UIDMAP;
+ } else if (strcmp("gid", idtype) == 0) {
+ cmd = LCFG_NODEMAP_ADD_GIDMAP;
+ } else {
+ fprintf(stderr, "usage: %s --name <name> --idtype [uid | gid]"
+ " --idmap <client id>:<filesystem id>\n", argv[0]);
+ return -1;
+ }
+
+ rc = nodemap_cmd(cmd, NULL, 0, argv[0], nodemap_name, idmap, NULL);
+ if (rc != 0) {
+ errno = -rc;
+ fprintf(stderr, "cannot add %smap '%s' to nodemap '%s'"
+ ": rc = %d\n", idtype, idmap, nodemap_name, rc);
+ }
+
+ return rc;
+}
+
+int jt_nodemap_del_idmap(int argc, char **argv)
+{
+ int c;
+ enum lcfg_command_type cmd = 0;
+ char *nodemap_name = NULL;
+ char *idmap = NULL;
+ char *idtype = NULL;
+ int rc = 0;
+
+ static struct option long_options[] = {
+ {
+ .name = "name",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'n',
+ },
+ {
+ .name = "idmap",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'm',
+ },
+ {
+ .name = "idtype",
+ .has_arg = required_argument,
+ .flag = 0,
+ .val = 'i',
+ },
+ {
+ NULL
+ }
+ };
+
+ while ((c = getopt_long(argc, argv, "n:m:i:",
+ long_options, NULL)) != -1) {
+ switch (c) {
+ case 'n':
+ nodemap_name = optarg;
+ break;
+ case 'm':
+ idmap = optarg;
+ break;
+ case 'i':
+ idtype = optarg;
+ break;
+ }
+ }
+
+ if (nodemap_name == NULL || idmap == NULL || idtype == NULL) {
+ fprintf(stderr, "usage: %s --name <name> --idtype [uid | gid]"
+ " --idmap <client id>:<filesystem id>\n", argv[0]);
+ return -1;
+ }
+
+ if (strcmp("uid", idtype) == 0)
+ cmd = LCFG_NODEMAP_DEL_UIDMAP;
+ else
+ cmd = LCFG_NODEMAP_DEL_GIDMAP;
+
+ rc = nodemap_cmd(cmd, NULL, 0, argv[0], nodemap_name, idmap, NULL);
+ if (rc != 0) {
+ errno = -rc;
+ fprintf(stderr, "cannot add %smap '%s' to nodemap '%s'"
+ ": rc = %d\n", idtype, idmap, nodemap_name, rc);
+ }
+
+ return rc;
+}
+
/*
* this function tranforms a rule [start-end/step] into an array
* of matching numbers
}
obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
- if (data.ioc_u32_1 == 0) {
- fprintf(stderr, "received invalid userid!\n");
- return EPROTO;
- }
+ if (data.ioc_u32_1 == 0) {
+ fprintf(stderr, "received invalid userid!\n");
+ return -EPROTO;
+ }
- if (lcfg_get_devname() != NULL)
- strcpy(devname, lcfg_get_devname());
- else
- sprintf(devname, "dev %d", cur_device);
+ if (lcfg_get_devname() != NULL) {
+ if (strlen(lcfg_get_devname()) > sizeof(devname)-1) {
+ fprintf(stderr, "Dev name too long\n");
+ return -E2BIG;
+ }
+ strncpy(devname, lcfg_get_devname(), sizeof(devname));
+ } else {
+ if (snprintf(devname, sizeof(devname), "dev %d", cur_device) >=
+ sizeof(devname)) {
+ fprintf(stderr, "Dev name too long\n");
+ return -E2BIG;
+ }
+ }
if (argc == 2)
/* -n means bare name */
}
obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
- if (data.ioc_u32_1 != id) {
- fprintf(stderr, "No changelog user '%s'. Blocking user"
- " is '"CHANGELOG_USER_PREFIX"%d'.\n", argv[1],
- data.ioc_u32_1);
- return ENOENT;
- }
+ if (data.ioc_u32_1 != id) {
+ fprintf(stderr, "No changelog user '%s'. Blocking user"
+ " is '"CHANGELOG_USER_PREFIX"%d'.\n", argv[1],
+ data.ioc_u32_1);
+ return -ENOENT;
+ }
- if (lcfg_get_devname() != NULL)
- strcpy(devname, lcfg_get_devname());
- else
- sprintf(devname, "dev %d", cur_device);
+ if (lcfg_get_devname() != NULL) {
+ if (strlen(lcfg_get_devname()) > sizeof(devname)-1) {
+ fprintf(stderr, "Dev name too long\n");
+ return -E2BIG;
+ }
+ strncpy(devname, lcfg_get_devname(), sizeof(devname));
+ } else {
+ if (snprintf(devname, sizeof(devname), "dev %d", cur_device) >=
+ sizeof(devname)) {
+ fprintf(stderr, "Dev name too long\n");
+ return -E2BIG;
+ }
+ }
printf("%s: Deregistered changelog user '"CHANGELOG_USER_PREFIX"%d'\n",
devname, data.ioc_u32_1);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff