LU-4528 llog: don't write llog in 3-steps

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

diff --git a/lustre/utils/lustre_cfg.c b/lustre/utils/lustre_cfg.c
index 6c8355d..03b1dc5 100644 (file)
--- a/lustre/utils/lustre_cfg.c
+++ b/lustre/utils/lustre_cfg.c
@@ -128,8 +128,12 @@ int jt_lcfg_attach(int argc, char **argv)
         lustre_cfg_bufs_set_string(&bufs, 2, argv[3]);
 
         lcfg = lustre_cfg_new(LCFG_ATTACH, &bufs);
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0) {
                 fprintf(stderr, "error: %s: LCFG_ATTACH %s\n",
                         jt_cmdname(argv[0]), strerror(rc = errno));
@@ -164,8 +168,12 @@ int jt_lcfg_setup(int argc, char **argv)
         }
 
         lcfg = lustre_cfg_new(LCFG_SETUP, &bufs);
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -192,8 +200,12 @@ int jt_obd_detach(int argc, char **argv)
                 return CMD_HELP;
 
         lcfg = lustre_cfg_new(LCFG_DETACH, &bufs);
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -242,8 +254,12 @@ int jt_obd_cleanup(int argc, char **argv)
         }
 
         lcfg = lustre_cfg_new(LCFG_CLEANUP, &bufs);
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0)
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -263,17 +279,16 @@ int do_add_uuid(char * func, char *uuid, lnet_nid_t nid)
                 lustre_cfg_bufs_set_string(&bufs, 1, uuid);
 
         lcfg = lustre_cfg_new(LCFG_ADD_UUID, &bufs);
-        lcfg->lcfg_nid = nid;
-        /* Poison NAL -- pre 1.4.6 will LASSERT on 0 NAL, this way it
-           doesn't work without crashing (bz 10130) */
-        lcfg->lcfg_nal = 0x5a;
-
-#if 0
-        fprintf(stderr, "adding\tnid: %d\tuuid: %s\n",
-               lcfg->lcfg_nid, uuid);
-#endif
-        rc = lcfg_ioctl(func, OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               lcfg->lcfg_nid = nid;
+               /* Poison NAL -- pre 1.4.6 will LASSERT on 0 NAL, this way it
+                * doesn't work without crashing (bz 10130) */
+               lcfg->lcfg_nal = 0x5a;
+               rc = lcfg_ioctl(func, OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc) {
                 fprintf(stderr, "IOC_PORTAL_ADD_UUID failed: %s\n",
                         strerror(errno));
@@ -317,8 +332,12 @@ int jt_lcfg_del_uuid(int argc, char **argv)
                 lustre_cfg_bufs_set_string(&bufs, 1, argv[1]);
 
         lcfg = lustre_cfg_new(LCFG_DEL_UUID, &bufs);
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc) {
                 fprintf(stderr, "IOC_PORTAL_DEL_UUID failed: %s\n",
                         strerror(errno));
@@ -342,8 +361,12 @@ int jt_lcfg_del_mount_option(int argc, char **argv)
         lustre_cfg_bufs_set_string(&bufs, 1, argv[1]);
 
         lcfg = lustre_cfg_new(LCFG_DEL_MOUNTOPT, &bufs);
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -368,12 +391,14 @@ int jt_lcfg_set_timeout(int argc, char **argv)
 
         lustre_cfg_bufs_reset(&bufs, lcfg_devname);
         lcfg = lustre_cfg_new(LCFG_SET_TIMEOUT, &bufs);
-        lcfg->lcfg_num = atoi(argv[1]);
-
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        //rc = lcfg_mgs_ioctl(argv[0], OBD_DEV_ID, lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               lcfg->lcfg_num = atoi(argv[1]);
 
-        lustre_cfg_free(lcfg);
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -407,10 +432,14 @@ int jt_lcfg_add_conn(int argc, char **argv)
         lustre_cfg_bufs_set_string(&bufs, 1, argv[1]);
 
         lcfg = lustre_cfg_new(LCFG_ADD_CONN, &bufs);
-        lcfg->lcfg_num = priority;
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               lcfg->lcfg_num = priority;
 
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free (lcfg);
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -441,9 +470,12 @@ int jt_lcfg_del_conn(int argc, char **argv)
         lustre_cfg_bufs_set_string(&bufs, 1, argv[1]);
 
         lcfg = lustre_cfg_new(LCFG_DEL_MOUNTOPT, &bufs);
-
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -469,9 +501,12 @@ int jt_lcfg_param(int argc, char **argv)
         }
 
         lcfg = lustre_cfg_new(LCFG_PARAM, &bufs);
-
-        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (rc < 0) {
                 fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
                         strerror(rc = errno));
@@ -534,11 +569,11 @@ static int jt_lcfg_mgsparam2(int argc, char **argv, struct param_opts *popt)
                lustre_cfg_bufs_set_string(&bufs, 1, buf);
 
                lcfg = lustre_cfg_new(LCFG_SET_PARAM, &bufs);
-               if (IS_ERR(lcfg)) {
+               if (lcfg == NULL) {
                        fprintf(stderr, "error: allocating lcfg for %s: %s\n",
-                               jt_cmdname(argv[0]), strerror(PTR_ERR(lcfg)));
+                               jt_cmdname(argv[0]), strerror(-ENOMEM));
                        if (rc == 0)
-                                rc = PTR_ERR(lcfg);
+                               rc = -ENOMEM;
                } else {
                        int rc2 = lcfg_mgs_ioctl(argv[0], OBD_DEV_ID, lcfg);
                        if (rc2 != 0) {
@@ -608,9 +643,12 @@ int jt_lcfg_mgsparam(int argc, char **argv)
 
         /* We could put other opcodes here. */
         lcfg = lustre_cfg_new(LCFG_PARAM, &bufs);
-
-        rc = lcfg_mgs_ioctl(argv[0], OBD_DEV_ID, lcfg);
-        lustre_cfg_free(lcfg);
+       if (lcfg == NULL) {
+               rc = -ENOMEM;
+       } else {
+               rc = lcfg_mgs_ioctl(argv[0], OBD_DEV_ID, lcfg);
+               lustre_cfg_free(lcfg);
+       }
         if (buf)
                 free(buf);
         if (rc < 0) {