Revert "LU-5541 lustreapi: only export the API symbols"

This commit breaks ubuntu 16 build not caught by review builder.

This reverts commit b36c377ff25c20417c481eab3798e67d042ec3a3.

Change-Id: Ibe9da0d7cd91dbf8a1d51ca3e531af1850af1fab
Reviewed-on: https://review.whamcloud.com/28782
Tested-by: Jenkins
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/include/lustre/lustreapi.h b/lustre/include/lustre/lustreapi.h
index c5e9855..6956768 100644 (file)
--- a/lustre/include/lustre/lustreapi.h
+++ b/lustre/include/lustre/lustreapi.h
@@ -50,12 +50,9 @@
 #define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
 #endif
 
-/* Currently external applications can access this but in the
- * future this will no longer be exposed for the user. Instead
- * if you want to know if the library is initialized just call
- * llapi_liblustreapi_initialized() which is now available. */
 extern bool liblustreapi_initialized;
 
+
 typedef void (*llapi_cb_t)(char *obd_type_name, char *obd_name, char *obd_uuid,
                           void *args);
 
@@ -74,10 +71,6 @@ enum llapi_message_level {
 typedef void (*llapi_log_callback_t)(enum llapi_message_level level, int err,
                                     const char *fmt, va_list ap);
 
-static inline bool llapi_liblustreapi_initialized(void)
-{
-       return liblustreapi_initialized;
-}
 
 /* the bottom three bits reserved for llapi_message_level */
 #define LLAPI_MSG_MASK          0x00000007

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 91a9ba7..a0031d2 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -70,8 +70,7 @@ lustre_rsync_LDADD :=  liblustreapi.la $(LIBPTLCTL) $(LIBREADLINE) $(PTHREAD_LIB
 lustre_rsync_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.la
 
 lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h
-lshowmount_LDADD :=  liblustreapi.la $(LIBPTLCTL)
-lshowmount_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.la
+lshowmount_LDADD :=  liblustreapi.la
 
 if EXT2FS_DEVEL
 EXT2FSLIB = -lext2fs
@@ -99,7 +98,7 @@ liblustreapi_la_SOURCES = liblustreapi.c liblustreapi_hsm.c \
                          $(top_builddir)/libcfs/libcfs/util/string.c \
                          $(top_builddir)/libcfs/libcfs/util/param.c \
                          liblustreapi_ladvise.c liblustreapi_chlg.c
-liblustreapi_la_LDFLAGS = -version-info 1:0:0 -Wl,--version-script=liblustreapi.map
+liblustreapi_la_LDFLAGS = -version-info 1:0:0
 
 if UTILS
 LIB_TARGETS =
@@ -204,7 +203,7 @@ wiretest_SOURCES = wiretest.c
 
 endif # UTILS
 
-EXTRA_DIST = llstat llobdstat plot-llstat ldlm_debug_upcall liblustreapi.map
+EXTRA_DIST = llstat llobdstat plot-llstat ldlm_debug_upcall
 
 # NOTE: this should only be run on i386.
 newwiretest: wirehdr.c wirecheck

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index 17f8ce3..44ce851 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -5404,7 +5404,7 @@ int main(int argc, char **argv)
         int rc;
 
        /* Ensure that liblustreapi constructor has run */
-       if (!llapi_liblustreapi_initialized())
+       if (!liblustreapi_initialized)
                fprintf(stderr, "liblustreapi was not properly initialized\n");
 
         setlinebuf(stdout);

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index 982f565..d237cab 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -255,7 +255,7 @@ int llapi_parse_size(const char *optarg, unsigned long long *size,
        return 0;
 }
 
-int llapi_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
+int obd_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
 {
        struct obd_ioctl_data *overlay;
        char *ptr;
@@ -302,7 +302,7 @@ int llapi_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len)
        return 0;
 }
 
-int llapi_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
+int obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len)
 {
        struct obd_ioctl_data *overlay;
        char *ptr;
@@ -860,7 +860,7 @@ int llapi_dir_create_pool(const char *name, int mode, int stripe_offset,
        data.ioc_inlbuf2 = (char *)&lmu;
        data.ioc_inllen2 = sizeof(struct lmv_user_md);
        data.ioc_type = mode;
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                llapi_error(LLAPI_MSG_ERROR, rc,
                            "error: LL_IOC_LMV_SETSTRIPE pack failed '%s'.",
@@ -3198,7 +3198,7 @@ int llapi_file_lookup(int dirfd, const char *name)
         data.ioc_inlbuf1 = (char *)name;
         data.ioc_inllen1 = strlen(name) + 1;
 
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 llapi_error(LLAPI_MSG_ERROR, rc,
                             "error: IOC_MDC_LOOKUP pack failed for '%s': rc %d",
@@ -3991,7 +3991,7 @@ static int cb_migrate_mdt_init(char *path, DIR *parent, DIR **dirp,
        data.ioc_inllen1 = strlen(filename) + 1;
        data.ioc_inlbuf2 = (char *)&param->fp_mdt_index;
        data.ioc_inllen2 = sizeof(param->fp_mdt_index);
-       ret = llapi_ioctl_pack(&data, &rawbuf, sizeof(raw));
+       ret = obd_ioctl_pack(&data, &rawbuf, sizeof(raw));
        if (ret != 0) {
                llapi_error(LLAPI_MSG_ERROR, ret,
                            "llapi_obd_statfs: error packing ioctl data");
@@ -4285,7 +4285,7 @@ int llapi_obd_fstatfs(int fd, __u32 type, __u32 index,
         data.ioc_pbuf2 = (char *)uuid_buf;
         data.ioc_plen2 = sizeof(struct obd_uuid);
 
-       rc = llapi_ioctl_pack(&data, &rawbuf, sizeof(raw));
+        rc = obd_ioctl_pack(&data, &rawbuf, sizeof(raw));
         if (rc != 0) {
                 llapi_error(LLAPI_MSG_ERROR, rc,
                             "llapi_obd_statfs: error packing ioctl data");

diff --git a/lustre/utils/liblustreapi.map b/lustre/utils/liblustreapi.map
deleted file mode 100644 (file)
index ebda578..0000000
--- a/lustre/utils/liblustreapi.map
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    global:
-       llapi_*;
-       liblustreapi_initialized;
-       mdt_hash_name;
-    local:
-       *;
-};

diff --git a/lustre/utils/liblustreapi_util.c b/lustre/utils/liblustreapi_util.c
index f4788a8..52e7f9c 100644 (file)
--- a/lustre/utils/liblustreapi_util.c
+++ b/lustre/utils/liblustreapi_util.c
@@ -53,6 +53,7 @@
  */
 bool liblustreapi_initialized;
 
+
 /**
  * Initialize the library once at startup.
  *

diff --git a/lustre/utils/lshowmount.c b/lustre/utils/lshowmount.c
index cddc2f9..5667ea0 100644 (file)
--- a/lustre/utils/lshowmount.c
+++ b/lustre/utils/lshowmount.c
@@ -51,8 +51,7 @@
 
 #include <linux/lustre/lustre_user.h>
 #include "nidlist.h"
-#include <lustre/lustreapi.h>
-#include <libcfs/util/param.h>
+#include "lustreapi_internal.h"
 
 #define PROC_UUID_TMPL         "%s/%s/uuid"
 
@@ -156,9 +155,10 @@ static int lshowmount(int lookup, int enumerate, int verbose)
        glob_t exp_list;
        int i;
 
-       i = cfs_get_param_paths(&exp_list, "{mgs,mdt,obdfilter}/*/exports");
+       i = get_lustre_param_path("{mgs,mdt,obdfilter}", "*",
+                                  FILTER_BY_EXACT, "exports", &exp_list);
        if (i < 0)
-               return -errno;
+               return i;
        if (!verbose)
                nidlist = nl_create();
        for (i = 0; i < exp_list.gl_pathc; i++) {

diff --git a/lustre/utils/lustre_lfsck.c b/lustre/utils/lustre_lfsck.c
index 82daa11..2524f99 100644 (file)
--- a/lustre/utils/lustre_lfsck.c
+++ b/lustre/utils/lustre_lfsck.c
@@ -434,7 +434,7 @@ bad_type:
        data.ioc_inlbuf1 = (char *)&start;
        data.ioc_inllen1 = sizeof(start);
        memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc != 0) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -446,7 +446,7 @@ bad_type:
                return rc;
        }
 
-       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       obd_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 +507,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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc != 0) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -584,7 +584,7 @@ bad_type:
        data.ioc_inlbuf1 = (char *)&query;
        data.ioc_inllen1 = sizeof(query);
        memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc != 0) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -596,7 +596,7 @@ bad_type:
                return rc;
        }
 
-       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       obd_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;

diff --git a/lustre/utils/lustreapi_internal.h b/lustre/utils/lustreapi_internal.h
index c020db1..3b94298 100644 (file)
--- a/lustre/utils/lustreapi_internal.h
+++ b/lustre/utils/lustreapi_internal.h
@@ -61,8 +61,8 @@
 int get_root_path(int want, char *fsname, int *outfd, char *path, int index);
 int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
               int want_error);
-int llapi_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len);
-int llapi_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len);
+int obd_ioctl_pack(struct obd_ioctl_data *data, char **pbuf, int max_len);
+int obd_ioctl_unpack(struct obd_ioctl_data *data, char *pbuf, int max_len);
 int sattr_cache_get_defaults(const char *const fsname,
                             const char *const pathname, unsigned int *scount,
                             unsigned int *ssize, unsigned int *soffset);

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 926bae0..33b67ca 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_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 = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+        rc = obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+                rc = obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+                rc = obd_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 = llapi_ioctl_pack(&data, &buf, 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_CREATE, buf);
-               llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+                obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid ioctl\n",
                                 jt_cmdname(argv[0]));
@@ -1754,14 +1754,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 = llapi_ioctl_pack(&data, &buf, 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_DESTROY, buf);
-               llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+                obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
                 shmem_bump(1);
                 if (rc < 0) {
                        fprintf(stderr, "error: %s: objid %#jx: %s\n",
@@ -1813,14 +1813,14 @@ int jt_obd_getattr(int argc, char **argv)
               (uintmax_t)ostid_id(&data.ioc_obdo1.o_oi));
 
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, buf);
-       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+        obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -1895,7 +1895,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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+               rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
                if (rc) {
                        fprintf(stderr, "error: %s: invalid ioctl\n",
                                jt_cmdname(argv[0]));
@@ -2126,7 +2126,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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+                rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid ioctl\n",
                                 jt_cmdname(argv[0]));
@@ -2248,7 +2248,7 @@ repeat:
         data.ioc_inllen3 = desc.ld_tgt_count * sizeof(*obdgens);
         data.ioc_inlbuf3 = (char *)obdgens;
 
-       if (llapi_ioctl_pack(&data, &buf, sizeof(rawbuf))) {
+        if (obd_ioctl_pack(&data, &buf, sizeof(rawbuf))) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
                 rc = -EINVAL;
@@ -2267,7 +2267,7 @@ repeat:
                 __u32 *genp;
                 int i;
 
-               if (llapi_ioctl_unpack(&data, buf, sizeof(rawbuf))) {
+                if (obd_ioctl_unpack(&data, buf, sizeof(rawbuf))) {
                         fprintf(stderr, "error: %s: invalid reply\n",
                                 jt_cmdname(argv[0]));
                         rc = -EINVAL;
@@ -2314,7 +2314,7 @@ static int do_activate(int argc, char **argv, int flag)
         data.ioc_offset = flag;
 
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2362,7 +2362,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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -2405,7 +2405,7 @@ int jt_obd_recover(int argc, char **argv)
         }
 
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2442,7 +2442,7 @@ int jt_obd_mdc_lookup(int argc, char **argv)
         data.ioc_inlbuf1 = child;
 
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2464,7 +2464,7 @@ int jt_obd_mdc_lookup(int argc, char **argv)
         close(fd);
 
         if (verbose) {
-               rc = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+                rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
                 if (rc) {
                         fprintf(stderr, "error: %s: invalid reply\n",
                                 jt_cmdname(argv[0]));
@@ -2495,7 +2495,7 @@ int jt_lcfg_fork(int argc, char **argv)
        data.ioc_inlbuf2 = argv[2];
 
        memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -2530,7 +2530,7 @@ int jt_lcfg_erase(int argc, char **argv)
        data.ioc_inlbuf1 = argv[1];
 
        memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -2558,7 +2558,7 @@ int jt_llog_catlist(int argc, char **argv)
         data.ioc_dev = cur_device;
         data.ioc_inllen1 = sizeof(rawbuf) - cfs_size_round(sizeof(data));
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2590,7 +2590,7 @@ int jt_llog_info(int argc, char **argv)
         data.ioc_inllen2 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) -
                 cfs_size_round(data.ioc_inllen1);
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2637,7 +2637,7 @@ int jt_llog_print(int argc, char **argv)
                 cfs_size_round(data.ioc_inllen2) -
                 cfs_size_round(data.ioc_inllen3);
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2747,7 +2747,7 @@ int jt_llog_cancel(int argc, char **argv)
        }
 
        memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -2795,7 +2795,7 @@ int jt_llog_check(int argc, char **argv)
                 cfs_size_round(data.ioc_inllen2) -
                 cfs_size_round(data.ioc_inllen3);
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -2829,7 +2829,7 @@ int jt_llog_remove(int argc, char **argv)
                 data.ioc_inlbuf2 = argv[2];
         }
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(argv[0]));
@@ -3138,7 +3138,7 @@ static int pool_cmd(enum lcfg_command_type cmd,
         data.ioc_pbuf1 = (void *)lcfg;
 
         memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+        rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
         if (rc) {
                 fprintf(stderr, "error: %s: invalid ioctl\n",
                         jt_cmdname(cmdname));
@@ -3221,7 +3221,7 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data,
        data.ioc_pbuf1 = (void *)lcfg;
 
        memset(buf, 0, sizeof(rawbuf));
-       rc = llapi_ioctl_pack(&data, &buf, 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);
@@ -3236,7 +3236,7 @@ static int nodemap_cmd(enum lcfg_command_type cmd, void *ret_data,
        }
 
        if (ret_data != NULL) {
-               rc = llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
                if (rc != 0)
                        goto out;
 
@@ -4133,7 +4133,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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -4176,7 +4176,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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -4208,7 +4208,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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -4219,7 +4219,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
-               llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
 
        return rc;
 }
@@ -4327,7 +4327,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 = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc) {
                fprintf(stderr, "Fail to pack ioctl data: rc = %d.\n", rc);
                return rc;
@@ -4338,7 +4338,7 @@ int jt_barrier_rescan(int argc, char **argv)
                fprintf(stderr, "Fail to rescan barrier bitmap for %s: %s\n",
                        argv[1], strerror(errno));
        } else {
-               llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+               obd_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]);
        }
@@ -4394,7 +4394,7 @@ int jt_get_obj_version(int argc, char **argv)
        data.ioc_inllen2 = sizeof version;
 
         memset(buf, 0, sizeof *buf);
-       rc = llapi_ioctl_pack(&data, &buf, sizeof rawbuf);
+        rc = obd_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 +4408,7 @@ int jt_get_obj_version(int argc, char **argv)
                 return -errno;
         }
 
-       llapi_ioctl_unpack(&data, buf, sizeof rawbuf);
+        obd_ioctl_unpack(&data, buf, sizeof rawbuf);
        printf("%#jx\n", (uintmax_t)version);
         return 0;
 }
@@ -4442,7 +4442,7 @@ int jt_changelog_register(int argc, char **argv)
 
        data.ioc_dev = cur_device;
 
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_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 +4457,7 @@ int jt_changelog_register(int argc, char **argv)
                return rc;
        }
 
-       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
 
        if (data.ioc_u32_1 == 0) {
                fprintf(stderr, "received invalid userid!\n");
@@ -4496,7 +4496,7 @@ int jt_changelog_deregister(int argc, char **argv)
        data.ioc_dev = cur_device;
        data.ioc_u32_1 = id;
 
-       rc = llapi_ioctl_pack(&data, &buf, sizeof(rawbuf));
+       rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
        if (rc < 0) {
                fprintf(stderr, "error: %s: invalid ioctl\n",
                        jt_cmdname(argv[0]));
@@ -4510,7 +4510,7 @@ int jt_changelog_deregister(int argc, char **argv)
                return rc;
        }
 
-       llapi_ioctl_unpack(&data, buf, sizeof(rawbuf));
+       obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
        printf("%s: Deregistered changelog user '%s%u'\n",
               device, CHANGELOG_USER_PREFIX, data.ioc_u32_1);