LU-8955 nodemap: add SELinux policy info to nodemap

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

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 33b67ca..d22a053 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -134,7 +134,7 @@ int lcfg_ioctl(char * func, int dev_id, struct lustre_cfg *lcfg)
                                         lcfg->lcfg_buflens);
         data.ioc_pbuf1 = (void *)lcfg;
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(func));
@@ -184,7 +184,7 @@ int lcfg_mgs_ioctl(char *func, int dev_id, struct lustre_cfg *lcfg)
                                         lcfg->lcfg_buflens);
         data.ioc_pbuf1 = (void *)lcfg;
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(func));
@@ -235,7 +235,7 @@ static int do_name2dev(char *func, char *name)
         data.ioc_inlbuf1 = name;
 
         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, "error: %s: invalid ioctl\n",
                         jt_cmdname(func));
@@ -244,7 +244,7 @@ static int do_name2dev(char *func, char *name)
         rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_NAME2DEV, buf);
         if (rc < 0)
                 return errno;
-        rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       rc = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid reply\n",
                         jt_cmdname(func));
@@ -858,7 +858,7 @@ int jt_obd_no_transno(int argc, char **argv)
                 return CMD_HELP;
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -885,7 +885,7 @@ int jt_obd_set_readonly(int argc, char **argv)
                 return CMD_HELP;
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -912,7 +912,7 @@ int jt_obd_abort_recovery(int argc, char **argv)
                 return CMD_HELP;
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -1097,7 +1097,7 @@ int jt_obd_alloc_fids(struct jt_fid_space *space, struct lu_fid *fid,
                 data.ioc_plen2 = sizeof(max_count);
 
                 memset(buf, 0, sizeof(rawbuf));
-                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: invalid ioctl rc = %d\n", rc);
                         return rc;
@@ -1378,7 +1378,7 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
                 count += data.ioc_count;
 
                 memset(buf, 0, sizeof(rawbuf));
-                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid ioctl %d\n",
                                 jt_cmdname(argv[0]), rc);
@@ -1514,14 +1514,14 @@ int jt_obd_create(int argc, char **argv)
                                         OBD_MD_FLPROJID;
 
                 memset(buf, 0, sizeof(rawbuf));
-                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid ioctl\n",
                                 jt_cmdname(argv[0]));
                         return rc;
                 }
                 rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CREATE, buf);
-                obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
                 shmem_bump(1);
                 if (rc < 0) {
                         fprintf(stderr, "error: %s: #%d - %s\n",
@@ -1584,7 +1584,7 @@ int jt_obd_setattr(int argc, char **argv)
        data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -1661,7 +1661,7 @@ int jt_obd_test_setattr(int argc, char **argv)
                 data.ioc_obdo1.o_mode = S_IFREG;
                 data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
                 memset(buf, 0, sizeof(rawbuf));
-                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid ioctl\n",
                                 jt_cmdname(argv[0]));
@@ -1715,6 +1715,7 @@ int jt_obd_destroy(int argc, char **argv)
         if (argc < 2 || argc > 4)
                 return CMD_HELP;
 
+       errno = 0;
         id = strtoull(argv[1], &end, 0);
         if (*end || id == 0 || errno != 0) {
                 fprintf(stderr, "error: %s: invalid objid '%s'\n",
@@ -1754,14 +1755,14 @@ int jt_obd_destroy(int argc, char **argv)
                data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE;
 
                 memset(buf, 0, sizeof(rawbuf));
-                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid ioctl\n",
                                 jt_cmdname(argv[0]));
                         return rc;
                 }
                 rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_DESTROY, buf);
-                obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
                 shmem_bump(1);
                 if (rc < 0) {
                        fprintf(stderr, "error: %s: objid %#jx: %s\n",
@@ -1813,14 +1814,14 @@ int jt_obd_getattr(int argc, char **argv)
               (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi));
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
                 return rc;
         }
         rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, buf);
-        obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -1895,7 +1896,7 @@ int jt_obd_test_getattr(int argc, char **argv)
                data.ioc_obdo1.o_mode = S_IFREG;
                data.ioc_obdo1.o_valid = 0xffffffff;
                memset(buf, 0, sizeof(rawbuf));
-               rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
                if (rc) {
                        fprintf(stderr, "error: %s: invalid ioctl\n",
                                jt_cmdname(argv[0]));
@@ -2126,7 +2127,7 @@ int jt_obd_test_brw(int argc, char **argv)
         for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) {
                 data.ioc_obdo1.o_valid &= ~(OBD_MD_FLBLOCKS|OBD_MD_FLGRANT);
                 memset(buf, 0, sizeof(rawbuf));
-                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid ioctl\n",
                                 jt_cmdname(argv[0]));
@@ -2248,7 +2249,7 @@ repeat:
         data.ioc_inllen3 = desc.ld_tgt_count * sizeof(*obdgens);
         data.ioc_inlbuf3 = (char *)obdgens;
 
-        if (obd_ioctl_pack(&data, &buf, sizeof(rawbuf))) {
+       if (llapi_ioctl_pack(&data, &buf, sizeof(rawbuf))) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
                 rc = -EINVAL;
@@ -2267,7 +2268,7 @@ repeat:
                 __u32 *genp;
                 int i;
 
-                if (obd_ioctl_unpack(&data, buf, sizeof(rawbuf))) {
+               if (llapi_ioctl_unpack(&data, buf, sizeof(rawbuf))) {
                         fprintf(stderr, "error: %s: invalid reply\n",
                                 jt_cmdname(argv[0]));
                         rc = -EINVAL;
@@ -2314,7 +2315,7 @@ static int do_activate(int argc, char **argv, int flag)
         data.ioc_offset = flag;
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2342,8 +2343,8 @@ static int do_activate(int argc, char **argv, int flag)
  * are skipped and recorded with new nids and uuid.
  *
  * \see mgs_replace_nids
- * \see mgs_replace_nids_log
- * \see mgs_replace_handler
+ * \see mgs_replace_log
+ * \see mgs_replace_nids_handler
  */
 int jt_replace_nids(int argc, char **argv)
 {
@@ -2362,7 +2363,7 @@ int jt_replace_nids(int argc, char **argv)
        data.ioc_inllen2 = strlen(argv[2]) + 1;
        data.ioc_inlbuf2 = argv[2];
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -2378,6 +2379,52 @@ int jt_replace_nids(int argc, char **argv)
        return rc;
 }
 
+/**
+ * Clear config logs for given device or filesystem.
+ * lctl clear_conf <devicename|fsname>
+ * Command has to be run on MGS node having MGS device mounted with -o
+ * nosvc.
+ *
+ * Configuration logs for filesystem or one particular log is
+ * processed. New log is created, original log is read, its records
+ * marked SKIP do not get copied to new log. Others are copied as-is.
+ * Original file is renamed to log.${time}.bak.
+ *
+ * \see mgs_clear_configs
+ * \see mgs_replace_log
+ * \see mgs_clear_config_handler
+ **/
+int jt_lcfg_clear(int argc, char **argv)
+{
+       int rc;
+       char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+       struct obd_ioctl_data data;
+
+       memset(&data, 0, sizeof(data));
+       data.ioc_dev = get_mgs_device();
+       if (argc != 2)
+               return CMD_HELP;
+
+       data.ioc_inllen1 = strlen(argv[1]) + 1;
+       data.ioc_inlbuf1 = argv[1];
+
+       memset(buf, 0, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       if (rc) {
+               fprintf(stderr, "error: %s: invalid ioctl\n",
+                       jt_cmdname(argv[0]));
+               return rc;
+       }
+
+       rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_CLEAR_CONFIGS, buf);
+       if (rc < 0) {
+               fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
+                       strerror(rc = errno));
+       }
+
+       return rc;
+}
+
 int jt_obd_deactivate(int argc, char **argv)
 {
         return do_activate(argc, argv, 0);
@@ -2405,7 +2452,7 @@ int jt_obd_recover(int argc, char **argv)
         }
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2442,7 +2489,7 @@ int jt_obd_mdc_lookup(int argc, char **argv)
         data.ioc_inlbuf1 = child;
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2464,7 +2511,7 @@ int jt_obd_mdc_lookup(int argc, char **argv)
         close(fd);
 
         if (verbose) {
-                rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               rc = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid reply\n",
                                 jt_cmdname(argv[0]));
@@ -2495,7 +2542,7 @@ int jt_lcfg_fork(int argc, char **argv)
        data.ioc_inlbuf2 = argv[2];
 
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -2530,7 +2577,7 @@ int jt_lcfg_erase(int argc, char **argv)
        data.ioc_inlbuf1 = argv[1];
 
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -2556,9 +2603,9 @@ int jt_llog_catlist(int argc, char **argv)
 
         memset(&data, 0, sizeof(data));
         data.ioc_dev = cur_device;
-        data.ioc_inllen1 = sizeof(rawbuf) - cfs_size_round(sizeof(data));
+       data.ioc_inllen1 = sizeof(rawbuf) - __ALIGN_KERNEL(sizeof(data), 8);
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2587,10 +2634,10 @@ int jt_llog_info(int argc, char **argv)
         data.ioc_dev = cur_device;
         data.ioc_inllen1 = strlen(argv[1]) + 1;
         data.ioc_inlbuf1 = argv[1];
-        data.ioc_inllen2 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) -
-                cfs_size_round(data.ioc_inllen1);
+       data.ioc_inllen2 = sizeof(rawbuf) - __ALIGN_KERNEL(sizeof(data), 8) -
+                          __ALIGN_KERNEL(data.ioc_inllen1, 8);
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2632,12 +2679,12 @@ int jt_llog_print(int argc, char **argv)
                 data.ioc_inllen3 = strlen(to) + 1;
                 data.ioc_inlbuf3 = to;
         }
-        data.ioc_inllen4 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) -
-                cfs_size_round(data.ioc_inllen1) -
-                cfs_size_round(data.ioc_inllen2) -
-                cfs_size_round(data.ioc_inllen3);
+       data.ioc_inllen4 = sizeof(rawbuf) - __ALIGN_KERNEL(sizeof(data), 8) -
+                          __ALIGN_KERNEL(data.ioc_inllen1, 8) -
+                          __ALIGN_KERNEL(data.ioc_inllen2, 8) -
+                          __ALIGN_KERNEL(data.ioc_inllen3, 8);
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2747,7 +2794,7 @@ int jt_llog_cancel(int argc, char **argv)
        }
 
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -2790,12 +2837,12 @@ int jt_llog_check(int argc, char **argv)
                 data.ioc_inllen3 = strlen(to) + 1;
                 data.ioc_inlbuf3 = to;
         }
-        data.ioc_inllen4 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) -
-                cfs_size_round(data.ioc_inllen1) -
-                cfs_size_round(data.ioc_inllen2) -
-                cfs_size_round(data.ioc_inllen3);
+       data.ioc_inllen4 = sizeof(rawbuf) - __ALIGN_KERNEL(sizeof(data), 8) -
+                          __ALIGN_KERNEL(data.ioc_inllen1, 8) -
+                          __ALIGN_KERNEL(data.ioc_inllen2, 8) -
+                          __ALIGN_KERNEL(data.ioc_inllen3, 8);
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2829,7 +2876,7 @@ int jt_llog_remove(int argc, char **argv)
                 data.ioc_inlbuf2 = argv[2];
         }
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2864,8 +2911,7 @@ int obd_initialize(int argc, char **argv)
        if (shmem_setup() != 0)
                return -1;
 
-       register_ioc_dev(OBD_DEV_ID, OBD_DEV_PATH,
-                        OBD_DEV_MAJOR, OBD_DEV_MINOR);
+       register_ioc_dev(OBD_DEV_ID, OBD_DEV_PATH);
 
        return 0;
 }
@@ -3138,7 +3184,7 @@ static int pool_cmd(enum lcfg_command_type cmd,
         data.ioc_pbuf1 = (void *)lcfg;
 
         memset(buf, 0, sizeof(rawbuf));
-        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(cmdname));
@@ -3221,7 +3267,7 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data,
        data.ioc_pbuf1 = (void *)lcfg;
 
        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, "error: invalid ioctl: %08x errno: %d with "
                               "rc=%d\n", cmd, errno, rc);
@@ -3236,7 +3282,7 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data,
        }
 
        if (ret_data != NULL) {
-               rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               rc = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
                if (rc != 0)
                        goto out;
 
@@ -3418,6 +3464,51 @@ int jt_nodemap_test_id(int argc, char **argv)
 }
 
 /**
+ * parse nid range
+ *
+ * \param      nodemap_range   --range string
+ * \param      nid_range       nid range string, min_nid:max_nid
+ *
+ * \retval                     0 on success
+ */
+static int parse_nid_range(char *nodemap_range, char *nid_range, int range_len)
+{
+       char                    min_nid[LNET_NIDSTR_SIZE + 1];
+       char                    max_nid[LNET_NIDSTR_SIZE + 1];
+       struct list_head        nidlist;
+       int                     rc = 0;
+
+       INIT_LIST_HEAD(&nidlist);
+
+       if (cfs_parse_nidlist(nodemap_range, strlen(nodemap_range),
+                             &nidlist) <= 0) {
+               fprintf(stderr,
+                       "error: nodemap_xxx_range: can't parse nid range: %s\n",
+                       nodemap_range);
+               return -1;
+       }
+
+       rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+                                      LNET_NIDSTR_SIZE);
+       if (rc < 0) {
+               if (rc == -EINVAL)
+                       fprintf(stderr,
+                               "error: nodemap_xxx_range: nid range uses "
+                               "currently unsupported features\n");
+               else if (rc == -ERANGE)
+                       fprintf(stderr,
+                               "error: nodemap_xxx_range: nodemap ranges must "
+                               "be contiguous\n");
+
+               return rc;
+       }
+
+       snprintf(nid_range, range_len, "%s:%s", min_nid, max_nid);
+
+       return rc;
+}
+
+/**
  * add an nid range to a nodemap
  *
  * \param      argc            number of args
@@ -3432,9 +3523,6 @@ 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;
@@ -3444,8 +3532,6 @@ int jt_nodemap_add_range(int argc, char **argv)
        { .val = 'r',   .name = "range",        .has_arg = required_argument },
        { .name = NULL } };
 
-       INIT_LIST_HEAD(&nidlist);
-
        while ((c = getopt_long(argc, argv, "n:r:",
                                long_opts, NULL)) != -1) {
                switch (c) {
@@ -3464,23 +3550,11 @@ int jt_nodemap_add_range(int argc, char **argv)
                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;
+       rc = parse_nid_range(nodemap_range, nid_range, sizeof(nid_range));
+       if (rc) {
+               errno = -rc;
+               return rc;
        }
-
-       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) {
@@ -3508,9 +3582,6 @@ 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;
@@ -3520,8 +3591,6 @@ int jt_nodemap_del_range(int argc, char **argv)
        { .val = 'r',   .name = "range",        .has_arg = required_argument },
        { .name = NULL } };
 
-       INIT_LIST_HEAD(&nidlist);
-
        while ((c = getopt_long(argc, argv, "n:r:",
                                long_opts, NULL)) != -1) {
                switch (c) {
@@ -3540,23 +3609,11 @@ int jt_nodemap_del_range(int argc, char **argv)
                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;
+       rc = parse_nid_range(nodemap_range, nid_range, sizeof(nid_range));
+       if (rc) {
+               errno = -rc;
+               return rc;
        }
-
-       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) {
@@ -3623,6 +3680,70 @@ int jt_nodemap_set_fileset(int argc, char **argv)
 }
 
 /**
+ * set SELinux policy info on a nodemap
+ *
+ * \param      argc            number of args
+ * \param      argv[]          variable string arguments
+ *
+ * --name                      nodemap name
+ * --sepol                     SELinux policy info
+ *
+ * \retval                     0 on success
+ */
+int jt_nodemap_set_sepol(int argc, char **argv)
+{
+       char *nodemap_name = NULL;
+       char *sepol = NULL;
+       int   rc = 0;
+       int   c;
+
+       static struct option long_options[] = {
+               {
+                       .name           = "name",
+                       .has_arg        = required_argument,
+                       .val            = 'n',
+               },
+               {
+                       .name           = "sepol",
+                       .has_arg        = required_argument,
+                       .val            = 's',
+               },
+               {
+                       .name = NULL,
+               }
+       };
+
+       while ((c = getopt_long(argc, argv, "n:s:",
+                               long_options, NULL)) != -1) {
+               switch (c) {
+               case 'n':
+                       nodemap_name = optarg;
+                       break;
+               case 's':
+                       sepol = optarg;
+                       break;
+               }
+       }
+
+       if (nodemap_name == NULL || sepol == NULL) {
+               fprintf(stderr, "usage: nodemap_set_sepol --name <name> "
+                               "--sepol <sepol>\n");
+               return -1;
+       }
+
+       rc = nodemap_cmd(LCFG_NODEMAP_SET_SEPOL, NULL, 0, argv[0],
+                        nodemap_name, sepol, NULL);
+       if (rc != 0) {
+               errno = -rc;
+               fprintf(stderr, "error: %s: cannot set sepol '%s' on nodemap "
+                               "'%s': rc = %d\n",
+                       jt_cmdname(argv[0]), sepol, nodemap_name, rc);
+       }
+
+       return rc;
+}
+
+/**
  * modify a nodemap's behavior
  *
  * \param      argc            number of args
@@ -3669,7 +3790,7 @@ int jt_nodemap_modify(int argc, char **argv)
                fprintf(stderr, "usage: nodemap_modify --name <nodemap_name> "
                                "--property <property_name> --value <value>\n");
                fprintf(stderr, "valid properties: admin trusted map_mode "
-                               "squash_uid squash_gid deny_unknown\n");
+                               "squash_uid squash_gid deny_unknown audit_mode\n");
                return -1;
        }
 
@@ -3685,6 +3806,8 @@ int jt_nodemap_modify(int argc, char **argv)
                cmd = LCFG_NODEMAP_SQUASH_GID;
        } else if (strcmp("map_mode", param) == 0) {
                cmd = LCFG_NODEMAP_MAP_MODE;
+       } else if (strcmp("audit_mode", param) == 0) {
+               cmd = LCFG_NODEMAP_AUDIT_MODE;
        } else {
                fprintf(stderr, "error: %s: nodemap_modify invalid "
                                "subcommand: %s\n",
@@ -3907,7 +4030,7 @@ static int extract_fsname_poolname(const char *arg, char *fsname,
        char *ptr;
        int rc;
 
-       strlcpy(fsname, arg, PATH_MAX + 1);
+       snprintf(fsname, PATH_MAX + 1, "%s", arg);
        ptr = strchr(fsname, '.');
        if (ptr == NULL) {
                fprintf(stderr, ". is missing in %s\n", fsname);
@@ -3932,6 +4055,11 @@ static int extract_fsname_poolname(const char *arg, char *fsname,
 
        strncpy(poolname, ptr, LOV_MAXPOOLNAME);
        poolname[LOV_MAXPOOLNAME] = '\0';
+
+       if (strncmp(poolname, "none", LOV_MAXPOOLNAME) == 0) {
+               fprintf(stderr, "poolname cannot be 'none'\n");
+               return -EINVAL;
+       }
        return 0;
 
 err:
@@ -4074,6 +4202,7 @@ out:
         return rc;
 }
 
+#ifdef HAVE_SERVER_SUPPORT
 static const char *barrier_status2name(enum barrier_status status)
 {
        switch (status) {
@@ -4133,7 +4262,7 @@ int jt_barrier_freeze(int argc, char **argv)
        data.ioc_inlbuf1 = (char *)&bc;
        data.ioc_inllen1 = sizeof(bc);
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -4176,7 +4305,7 @@ int jt_barrier_thaw(int argc, char **argv)
        data.ioc_inlbuf1 = (char *)&bc;
        data.ioc_inllen1 = sizeof(bc);
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -4208,7 +4337,7 @@ int __jt_barrier_stat(const char *fsname, struct barrier_ctl *bc)
        data.ioc_inlbuf1 = (char *)bc;
        data.ioc_inllen1 = sizeof(*bc);
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -4219,7 +4348,7 @@ int __jt_barrier_stat(const char *fsname, struct barrier_ctl *bc)
                fprintf(stderr, "Fail to query barrier for %s: %s\n",
                        fsname, strerror(errno));
        else
-               obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
 
        return rc;
 }
@@ -4327,7 +4456,7 @@ int jt_barrier_rescan(int argc, char **argv)
        data.ioc_inlbuf1 = (char *)&bc;
        data.ioc_inllen1 = sizeof(bc);
        memset(buf, 0, sizeof(rawbuf));
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -4338,13 +4467,14 @@ int jt_barrier_rescan(int argc, char **argv)
                fprintf(stderr, "Fail to rescan barrier bitmap for %s: %s\n",
                        argv[1], strerror(errno));
        } else {
-               obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
                printf("%u of %u MDT(s) in the filesystem %s are inactive\n",
                       bc.bc_absence, bc.bc_total, argv[1]);
        }
 
        return rc;
 }
+#endif /* HAVE_SERVER_SUPPORT */
 
 int jt_get_obj_version(int argc, char **argv)
 {
@@ -4394,7 +4524,7 @@ int jt_get_obj_version(int argc, char **argv)
        data.ioc_inllen2 = sizeof version;
 
         memset(buf, 0, sizeof *buf);
-        rc = obd_ioctl_pack(&data, &buf, sizeof rawbuf);
+       rc = llapi_ioctl_pack(&data, &buf, sizeof rawbuf);
         if (rc) {
                 fprintf(stderr, "error: %s: packing ioctl arguments: %s\n",
                         jt_cmdname(argv[0]), strerror(-rc));
@@ -4408,7 +4538,7 @@ int jt_get_obj_version(int argc, char **argv)
                 return -errno;
         }
 
-        obd_ioctl_unpack(&data, buf, sizeof rawbuf);
+       llapi_ioctl_unpack(&data, buf, sizeof rawbuf);
        printf("%#jx\n", (uintmax_t)version);
         return 0;
 }
@@ -4442,7 +4572,7 @@ int jt_changelog_register(int argc, char **argv)
 
        data.ioc_dev = cur_device;
 
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc < 0) {
                fprintf(stderr, "error: %s: cannot pack ioctl: %s\n",
                        jt_cmdname(argv[0]), strerror(-rc));
@@ -4457,7 +4587,7 @@ int jt_changelog_register(int argc, char **argv)
                return rc;
        }
 
-       obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
 
        if (data.ioc_u32_1 == 0) {
                fprintf(stderr, "received invalid userid!\n");
@@ -4496,7 +4626,7 @@ int jt_changelog_deregister(int argc, char **argv)
        data.ioc_dev = cur_device;
        data.ioc_u32_1 = id;
 
-       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc < 0) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -4510,7 +4640,7 @@ int jt_changelog_deregister(int argc, char **argv)
                return rc;
        }
 
-       obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
        printf("%s: Deregistered changelog user '%s%u'\n",
               device, CHANGELOG_USER_PREFIX, data.ioc_u32_1);