* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Author: Robert Read <rread@clusterfs.com>
*/
-#include <stdlib.h>
#include <sys/ioctl.h>
-#include <fcntl.h>
#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
#include <sys/types.h>
+#include <sys/un.h>
#include <sys/wait.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <signal.h>
+
#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
#include <glob.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
#include "obdctl.h"
#include <obd.h> /* for struct lov_stripe_md */
#include <lustre/lustre_build_version.h>
-#include <unistd.h>
-#include <sys/un.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <string.h>
-
#include <obd_class.h>
#include <lnet/lnetctl.h>
#include <libcfs/libcfsutil.h>
-#include <stdio.h>
#include <lustre/liblustreapi.h>
#define MAX_STRING_SIZE 128
const int nthreads = 1;
#endif
-static char rawbuf[8192];
-static char *buf = rawbuf;
-static int max = sizeof(rawbuf);
+#define MAX_IOC_BUFLEN 8192
static int cur_device = -1;
return l_ioctl(dev_id, opc, buf);
}
-#define IOC_INIT(data) \
-do { \
- memset(&data, 0, sizeof(data)); \
- data.ioc_dev = cur_device; \
-} while (0)
-
-#define IOC_PACK(func, data) \
-do { \
- memset(buf, 0, sizeof(rawbuf)); \
- if (obd_ioctl_pack(&data, &buf, max)) { \
- fprintf(stderr, "error: %s: invalid ioctl\n", \
- jt_cmdname(func)); \
- return -2; \
- } \
-} while (0)
-
-#define IOC_UNPACK(func, data) \
-do { \
- if (obd_ioctl_unpack(&data, buf, max)) { \
- fprintf(stderr, "error: %s: invalid reply\n", \
- jt_cmdname(func)); \
- return -2; \
- } \
-} while (0)
-
int lcfg_ioctl(char * func, int dev_id, struct lustre_cfg *lcfg)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_type = LUSTRE_CFG_TYPE;
data.ioc_plen1 = lustre_cfg_len(lcfg->lcfg_bufcount,
lcfg->lcfg_buflens);
data.ioc_pbuf1 = (void *)lcfg;
- IOC_PACK(func, data);
+ memset(buf, 0, sizeof(rawbuf));
+ rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+ if (rc) {
+ fprintf(stderr, "error: %s: invalid ioctl\n",
+ jt_cmdname(func));
+ return rc;
+ }
rc = l_ioctl(dev_id, OBD_IOC_PROCESS_CFG, buf);
int lcfg_mgs_ioctl(char *func, int dev_id, struct lustre_cfg *lcfg)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
rc = data.ioc_dev = get_mgs_device();
if (rc < 0)
goto out;
data.ioc_plen1 = lustre_cfg_len(lcfg->lcfg_bufcount,
lcfg->lcfg_buflens);
data.ioc_pbuf1 = (void *)lcfg;
- IOC_PACK(func, data);
+ memset(buf, 0, sizeof(rawbuf));
+ rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+ if (rc) {
+ fprintf(stderr, "error: %s: invalid ioctl\n",
+ jt_cmdname(func));
+ return rc;
+ }
rc = l_ioctl(dev_id, OBD_IOC_PARAM, buf);
out:
if (rc) {
if (errno == ENOSYS)
fprintf(stderr, "Make sure cfg_device is set first.\n");
- if (errno == EINVAL)
- fprintf(stderr, "cfg_device should be of the form "
- "'lustre-MDT0000'\n");
}
return rc;
}
"\nctime: "LPU64"\nsize: "LPU64"\nblocks: "LPU64
"\nblksize: %u\nmode: %o\nuid: %d\ngid: %d\nflags: %x\n"
"misc: %x\nnlink: %d,\nvalid "LPX64"\n",
- obd->o_id, obd->o_gr, obd->o_atime, obd->o_mtime, obd->o_ctime,
+ obd->o_id, obd->o_seq, obd->o_atime, obd->o_mtime, obd->o_ctime,
obd->o_size, obd->o_blocks, obd->o_blksize, obd->o_mode,
obd->o_uid, obd->o_gid, obd->o_flags, obd->o_misc,
obd->o_nlink, obd->o_valid);
static int do_name2dev(char *func, char *name)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
- IOC_INIT(data);
-
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_inllen1 = strlen(name) + 1;
data.ioc_inlbuf1 = name;
- IOC_PACK(func, data);
+ memset(buf, 0, sizeof(rawbuf));
+ rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+ if (rc) {
+ fprintf(stderr, "error: %s: invalid ioctl\n",
+ jt_cmdname(func));
+ return rc;
+ }
rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_NAME2DEV, buf);
if (rc < 0)
return errno;
- IOC_UNPACK(func, data);
+ rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+ if (rc) {
+ fprintf(stderr, "error: %s: invalid reply\n",
+ jt_cmdname(func));
+ return rc;
+ }
return data.ioc_dev + N2D_OFF;
}
// printf("Name %s is device %d\n", name, ret);
} else {
fprintf(stderr, "No device found for name %s: %s\n",
- name, strerror(rc));
+ name, strerror(rc));
}
}
return ret;
static inline void shmem_bump(void)
{
- static int bumped_running;
+ static bool running_not_bumped = true;
if (shared_data == NULL || thread <= 0 || thread > MAX_THREADS)
return;
shmem_lock();
shared_data->counters[thread - 1]++;
- if (!bumped_running)
+ if (running_not_bumped) {
shared_data->running++;
+ running_not_bumped = false;
+ }
shmem_unlock();
- bumped_running = 1;
}
static void shmem_snap(int total_threads, int live_threads)
(prev_time.tv_sec + prev_time.tv_usec / 1000000.0);
if (prev_valid &&
- live_threads == total_threads &&
- secs > 0.0) /* someone screwed with the time? */
+ secs > 1.0) /* someone screwed with the time? */
printf("%d/%d Total: %f/second\n", non_zero, total_threads, total / secs);
memcpy(counter_snapshot[1], counter_snapshot[0],
thread = i;
argv[2] = "--device";
- return jt_opt_device(argc - 2, argv + 2);
+ exit(jt_opt_device(argc - 2, argv + 2));
} else if (be_verbose(verbose, NULL, i, &next_thread, threads))
printf("%s: thread #%d (PID %d) started\n",
argv[0], i, rc);
int jt_obd_no_transno(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc != 1)
return CMD_HELP;
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_NO_TRANSNO, buf);
if (rc < 0)
fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
int jt_obd_set_readonly(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc != 1)
return CMD_HELP;
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_SET_READONLY, buf);
if (rc < 0)
fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
int jt_obd_abort_recovery(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc != 1)
return CMD_HELP;
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_ABORT_RECOVERY, buf);
if (rc < 0)
fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
int jt_get_version(int argc, char **argv)
{
int rc;
- char buf[8192];
- struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf;
+ char rawbuf[MAX_IOC_BUFLEN];
+ char *version;
if (argc != 1)
return CMD_HELP;
- memset(buf, 0, sizeof(buf));
- data->ioc_version = OBD_IOCTL_VERSION;
- data->ioc_inllen1 = sizeof(buf) - size_round(sizeof(*data));
- data->ioc_inlbuf1 = buf + size_round(sizeof(*data));
- data->ioc_len = obd_ioctl_packlen(data);
-
- rc = l2_ioctl(OBD_DEV_ID, OBD_GET_VERSION, buf);
- if (rc < 0)
+ rc = llapi_get_version(rawbuf, MAX_IOC_BUFLEN, &version);
+ if (rc)
fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
- strerror(rc = errno));
- else {
- printf("Lustre version: %s\n", data->ioc_bulk);
- }
+ strerror(-rc));
+ else
+ printf("Lustre version: %s\n", version);
printf("lctl version: %s\n", BUILD_VERSION);
return rc;
goto fail;
got_one:
- fgets(buf, sizeof(buf), fp);
+ /* should not ignore fgets(3)'s return value */
+ if (!fgets(buf, sizeof(buf), fp)) {
+ fprintf(stderr, "reading from %s: %s", buf, strerror(errno));
+ fclose(fp);
+ return;
+ }
fclose(fp);
/* trim trailing newlines */
int jt_obd_list_ioctl(int argc, char **argv)
{
int rc, index;
- char buf[8192];
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
struct obd_ioctl_data *data = (struct obd_ioctl_data *)buf;
if (argc > 2)
return CMD_HELP;
for (index = 0;; index++) {
- memset(buf, 0, sizeof(buf));
+ memset(buf, 0, sizeof(rawbuf));
data->ioc_version = OBD_IOCTL_VERSION;
- data->ioc_inllen1 = sizeof(buf) - size_round(sizeof(*data));
- data->ioc_inlbuf1 = buf + size_round(sizeof(*data));
+ data->ioc_inllen1 =
+ sizeof(rawbuf) - cfs_size_round(sizeof(*data));
+ data->ioc_inlbuf1 = buf + cfs_size_round(sizeof(*data));
data->ioc_len = obd_ioctl_packlen(data);
data->ioc_count = index;
rc = 0;
else
fprintf(stderr, "Error getting device list: %s: "
- "check dmesg.\n",
- strerror(errno));
+ "check dmesg.\n", strerror(errno));
}
return rc;
}
return 0;
}
-
-
-
/* Create one or more objects, arg[4] may describe stripe meta-data. If
* not, defaults assumed. This echo-client instance stashes the stripe
* object ids. Use get_stripe on this node to print full lsm and
/* create <count> [<file_create_mode>] [q|v|# verbosity] [striping] */
int jt_obd_create(int argc, char **argv)
{
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
struct obd_ioctl_data data;
struct timeval next_time;
__u64 count = 1, next_count, base_id = 0;
int verbose = 1, mode = 0100644, rc = 0, i, valid_lsm = 0;
char *end;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc < 2 || argc > 5)
return CMD_HELP;
return CMD_HELP;
}
- if (argc < 5)
+ if (argc < 5) {
reset_lsmb (&lsm_buffer); /* will set default */
- else {
+ } else {
rc = parse_lsm (&lsm_buffer, argv[4]);
if (rc != 0) {
fprintf(stderr, "error: %s: invalid lsm '%s'\n",
data.ioc_pbuf1 = (char *)&lsm_buffer;
}
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_CREATE, buf);
- IOC_UNPACK(argv[0], data);
+ obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
shmem_bump();
if (rc < 0) {
fprintf(stderr, "error: %s: #%d - %s\n",
int jt_obd_setattr(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
char *end;
int rc;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc != 2)
return CMD_HELP;
}
data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_SETATTR, buf);
if (rc < 0)
fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
struct obd_ioctl_data data;
struct timeval start, next_time;
__u64 i, count, next_count;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int verbose = 1;
obd_id objid = 3;
char *end;
if (argc < 2 || argc > 4)
return CMD_HELP;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
count = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid iteration count '%s'\n",
data.ioc_obdo1.o_id = objid;
data.ioc_obdo1.o_mode = S_IFREG;
data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
- IOC_PACK(argv[0], data);
+ memset(buf, 0x00, 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_SETATTR, &data);
shmem_bump();
if (rc < 0) {
{
struct obd_ioctl_data data;
struct timeval next_time;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
__u64 count = 1, next_count;
int verbose = 1;
__u64 id;
char *end;
int rc = 0, i;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc < 2 || argc > 4)
return CMD_HELP;
data.ioc_obdo1.o_mode = S_IFREG | 0644;
data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLMODE;
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_DESTROY, buf);
- IOC_UNPACK(argv[0], data);
+ obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
shmem_bump();
if (rc < 0) {
fprintf(stderr, "error: %s: objid "LPX64": %s\n",
int jt_obd_getattr(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
char *end;
int rc;
if (argc != 2)
return CMD_HELP;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_obdo1.o_id = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid objid '%s'\n",
data.ioc_obdo1.o_valid = 0xffffffff;
printf("%s: object id "LPX64"\n", jt_cmdname(argv[0]),data.ioc_obdo1.o_id);
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_GETATTR, buf);
- IOC_UNPACK(argv[0], data);
+ obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
if (rc) {
fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
strerror(rc = errno));
{
struct obd_ioctl_data data;
struct timeval start, next_time;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
__u64 i, count, next_count;
int verbose = 1;
obd_id objid = 3;
if (argc < 2 || argc > 4)
return CMD_HELP;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
count = strtoull(argv[1], &end, 0);
if (*end) {
fprintf(stderr, "error: %s: invalid iteration count '%s'\n",
data.ioc_obdo1.o_id = objid;
data.ioc_obdo1.o_mode = S_IFREG;
data.ioc_obdo1.o_valid = 0xffffffff;
- IOC_PACK(argv[0], data);
+ memset(buf, 0x00, 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, &data);
shmem_bump();
if (rc < 0) {
{
struct obd_ioctl_data data;
struct timeval start, next_time;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
__u64 count, next_count, len, stride, thr_offset = 0, objid = 3;
int write = 0, verbose = 1, cmd, i, rc = 0, pages = 1;
int offset_pages = 0;
}
}
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
/* communicate the 'type' of brw test and batching to echo_client.
* don't start. we'd love to refactor this lctl->echo_client
obj_idx = (thread - 1)/nthr_per_obj;
objid += obj_idx;
stride *= nthr_per_obj;
- if (thread == 1)
+ if ((thread - 1) % nthr_per_obj == 0)
shared_data->offsets[obj_idx] = stride + thr_offset;
thr_offset += ((thread - 1) % nthr_per_obj) * len;
} else {
l_cond_broadcast(&shared_data->cond);
else
l_cond_wait(&shared_data->cond,
- &shared_data->mutex);
+ &shared_data->mutex);
shmem_unlock ();
}
cmd = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ;
for (i = 1, next_count = verbose; i <= count && shmem_running(); i++) {
data.ioc_obdo1.o_valid &= ~(OBD_MD_FLBLOCKS|OBD_MD_FLGRANT);
- IOC_PACK(argv[0], data);
+ memset(buf, 0x00, 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, cmd, buf);
shmem_bump();
if (rc) {
struct obd_ioctl_data data;
struct lov_desc desc;
struct obd_uuid *uuidarray;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
__u32 *obdgens;
char *path;
int rc, fd;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc != 2)
return CMD_HELP;
desc.ld_tgt_count = ((OBD_MAX_IOCTL_BUFFER-sizeof(data)-sizeof(desc)) /
(sizeof(*uuidarray) + sizeof(*obdgens)));
-
repeat:
uuidarray = calloc(desc.ld_tgt_count, sizeof(*uuidarray));
if (!uuidarray) {
goto out_uuidarray;
}
+ memset(buf, 0x00, sizeof(rawbuf));
data.ioc_inllen1 = sizeof(desc);
data.ioc_inlbuf1 = (char *)&desc;
data.ioc_inllen2 = desc.ld_tgt_count * sizeof(*uuidarray);
data.ioc_inllen3 = desc.ld_tgt_count * sizeof(*obdgens);
data.ioc_inlbuf3 = (char *)obdgens;
- if (obd_ioctl_pack(&data, &buf, max)) {
+ if (obd_ioctl_pack(&data, &buf, sizeof(rawbuf))) {
fprintf(stderr, "error: %s: invalid ioctl\n",
jt_cmdname(argv[0]));
rc = -EINVAL;
__u32 *genp;
int i;
- if (obd_ioctl_unpack(&data, buf, max)) {
+ if (obd_ioctl_unpack(&data, buf, sizeof(rawbuf))) {
fprintf(stderr, "error: %s: invalid reply\n",
jt_cmdname(argv[0]));
rc = -EINVAL;
{
int rc;
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
char argstring[200];
int i, count = sizeof(argstring) - 1;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc > 5)
return CMD_HELP;
data.ioc_inllen1 = strlen(argstring) + 1;
}
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, IOC_LDLM_REGRESS_START, buf);
if (rc)
fprintf(stderr, "error: %s: test failed: %s\n",
int jt_obd_ldlm_regress_stop(int argc, char **argv)
{
int rc;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
struct obd_ioctl_data data;
- IOC_INIT(data);
+
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc != 1)
return CMD_HELP;
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, IOC_LDLM_REGRESS_STOP, buf);
if (rc)
static int do_activate(int argc, char **argv, int flag)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc != 1)
return CMD_HELP;
/* reuse offset for 'active' */
data.ioc_offset = flag;
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, IOC_OSC_SET_ACTIVE, buf);
if (rc)
fprintf(stderr, "error: %s: failed: %s\n",
int jt_obd_recover(int argc, char **argv)
{
int rc;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
struct obd_ioctl_data data;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
if (argc > 2)
return CMD_HELP;
data.ioc_inlbuf1 = argv[1];
}
- IOC_PACK(argv[0], data);
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_CLIENT_RECOVER, buf);
if (rc < 0) {
fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
int jt_obd_mdc_lookup(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
char *parent, *child;
int rc, fd, verbose = 1;
if (argc == 4)
verbose = get_verbose(argv[0], argv[3]);
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_inllen1 = strlen(child) + 1;
data.ioc_inlbuf1 = child;
- IOC_PACK(argv[0], data);
+ 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;
+ }
fd = open(parent, O_RDONLY);
if (fd < 0) {
close(fd);
if (verbose) {
- IOC_UNPACK(argv[0], data);
+ rc = obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+ if (rc) {
+ fprintf(stderr, "error: %s: invalid reply\n",
+ jt_cmdname(argv[0]));
+ return rc;
+ }
printf("%s: mode %o uid %d gid %d\n", child,
data.ioc_obdo1.o_mode, data.ioc_obdo1.o_uid,
data.ioc_obdo1.o_gid);
int jt_cfg_dump_log(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
- IOC_INIT(data);
-
if (argc != 2)
return CMD_HELP;
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_inllen1 = strlen(argv[1]) + 1;
data.ioc_inlbuf1 = argv[1];
- IOC_PACK(argv[0], data);
+ 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_DUMP_LOG, buf);
if (rc < 0)
fprintf(stderr, "OBD_IOC_DUMP_LOG failed: %s\n",
int jt_llog_catlist(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
if (argc != 1)
return CMD_HELP;
- IOC_INIT(data);
- data.ioc_inllen1 = max - size_round(sizeof(data));
- IOC_PACK(argv[0], data);
-
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
+ data.ioc_inllen1 = sizeof(rawbuf) - cfs_size_round(sizeof(data));
+ 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_CATLOGLIST, buf);
if (rc == 0)
fprintf(stdout, "%s", ((struct obd_ioctl_data*)buf)->ioc_bulk);
int jt_llog_info(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
if (argc != 2)
return CMD_HELP;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_inllen1 = strlen(argv[1]) + 1;
data.ioc_inlbuf1 = argv[1];
- data.ioc_inllen2 = max - size_round(sizeof(data)) -
- size_round(data.ioc_inllen1);
- IOC_PACK(argv[0], data);
+ data.ioc_inllen2 = sizeof(rawbuf) - cfs_size_round(sizeof(data)) -
+ cfs_size_round(data.ioc_inllen1);
+ 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_INFO, buf);
if (rc == 0)
int jt_llog_print(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
if (argc != 2 && argc != 4)
return CMD_HELP;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_inllen1 = strlen(argv[1]) + 1;
data.ioc_inlbuf1 = argv[1];
if (argc == 4) {
data.ioc_inllen3 = strlen(to) + 1;
data.ioc_inlbuf3 = to;
}
- data.ioc_inllen4 = max - size_round(sizeof(data)) -
- size_round(data.ioc_inllen1) -
- size_round(data.ioc_inllen2) -
- size_round(data.ioc_inllen3);
- IOC_PACK(argv[0], data);
+ 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);
+ 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_PRINT, buf);
if (rc == 0)
int jt_llog_cancel(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
if (argc != 4)
return CMD_HELP;
- IOC_INIT(data);
+ memset(&data, 0x00, 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];
- IOC_PACK(argv[0], data);
+ 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)
int jt_llog_check(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
if (argc != 2 && argc != 4)
return CMD_HELP;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_inllen1 = strlen(argv[1]) + 1;
data.ioc_inlbuf1 = argv[1];
if (argc == 4) {
data.ioc_inllen3 = strlen(to) + 1;
data.ioc_inlbuf3 = to;
}
- data.ioc_inllen4 = max - size_round(sizeof(data)) -
- size_round(data.ioc_inllen1) -
- size_round(data.ioc_inllen2) -
- size_round(data.ioc_inllen3);
- IOC_PACK(argv[0], data);
+ 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);
+ 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_CHECK, buf);
if (rc == 0)
int jt_llog_remove(int argc, char **argv)
{
struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
int rc;
if (argc != 3 && argc != 2)
return CMD_HELP;
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
data.ioc_inllen1 = strlen(argv[1]) + 1;
data.ioc_inlbuf1 = argv[1];
if (argc == 3){
data.ioc_inllen2 = strlen(argv[2]) + 1;
data.ioc_inlbuf2 = argv[2];
}
- IOC_PACK(argv[0], data);
+ 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_REMOVE, buf);
if (rc == 0) {
{
FILE *fp;
int found = 0;
- char modname[256];
+ char buf[1024];
fp = fopen("/proc/modules", "r");
if (fp == NULL)
return -1;
- while (fscanf(fp, "%s %*s %*s %*s %*s %*s", modname) == 1) {
- if (strcmp(module, modname) == 0) {
+ while (fgets(buf, 1024, fp) != NULL) {
+ *strchr(buf, ' ') = 0;
+ if (strcmp(module, buf) == 0) {
found = 1;
break;
}
{
char *filename;
int rc, fd;
- __u64 ino;
+ struct lu_fid fid;
if (argc != 2)
return CMD_HELP;
return CMD_HELP;
}
- rc = ioctl(fd, LL_IOC_LLOOP_INFO, &ino);
+ rc = ioctl(fd, LL_IOC_LLOOP_INFO, &fid);
if (rc < 0) {
rc = errno;
fprintf(stderr, "error: %s\n", strerror(errno));
goto out;
}
fprintf(stdout, "lloop device info: ");
- if (ino == 0ULL)
+ if (fid_is_zero(&fid))
fprintf(stdout, "Not attached\n");
else
- fprintf(stdout, "attached to inode "LPU64"\n", ino);
+ fprintf(stdout, "attached to inode "DFID"\n", PFID(&fid));
out:
close(fd);
return -rc;
do_disconnect(argv[0], 1);
}
-static int find_target_obdpath(char *fsname, char *path)
-{
- glob_t glob_info;
- char pattern[PATH_MAX + 1];
- int rc;
-
- snprintf(pattern, PATH_MAX,
- "/proc/fs/lustre/lov/%s-*/target_obd",
- fsname);
- rc = glob(pattern, GLOB_BRACE, NULL, &glob_info);
- if (rc)
- return -EINVAL;
-
- if (glob_info.gl_pathc == 0) {
- globfree(&glob_info);
- return -EINVAL;
- }
-
- strcpy(path, glob_info.gl_pathv[0]);
- return 0;
-}
-
-static int find_poolpath(char *fsname, char *poolname, char *poolpath)
+static int check_pool_cmd(enum lcfg_command_type cmd,
+ char *fsname, char *poolname,
+ char *ostname)
{
- glob_t glob_info;
- char pattern[PATH_MAX + 1];
int rc;
- snprintf(pattern, PATH_MAX,
- "/proc/fs/lustre/lov/%s-*/pools/%s",
- fsname, poolname);
- rc = glob(pattern, GLOB_BRACE, NULL, &glob_info);
- if (rc)
- return -EINVAL;
-
- if (glob_info.gl_pathc == 0) {
- globfree(&glob_info);
- return -EINVAL;
- }
-
- strcpy(poolpath, glob_info.gl_pathv[0]);
- return 0;
-}
-
-/*
- * if pool is NULL, search ostname in target_obd
- * if pool is no NULL
- * if pool not found returns < 0
- * if ostname is NULL, returns 1 if pool is not empty and 0 if pool empty
- * if ostname is not NULL, returns 1 if OST is in pool and 0 if not
- */
-static int search_ost(char *fsname, char *poolname, char *ostname)
-{
- FILE *fd;
- char buffer[PATH_MAX + 1];
- int len = 0, rc;
-
- if (ostname != NULL)
- len = strlen(ostname);
-
- if (poolname == NULL)
- rc = find_target_obdpath(fsname, buffer);
- else
- rc = find_poolpath(fsname, poolname, buffer);
- if (rc)
+ rc = llapi_search_ost(fsname, poolname, ostname);
+ if (rc < 0 && (cmd != LCFG_POOL_NEW)) {
+ fprintf(stderr, "Pool %s.%s not found\n",
+ fsname, poolname);
return rc;
-
- if ((fd = fopen(buffer, "r")) == NULL)
- return -EINVAL;
-
- while (fgets(buffer, sizeof(buffer), fd) != NULL) {
- if (poolname == NULL) {
- /* we search ostname in target_obd */
- if (strncmp(buffer + 3, ostname, len) == 0) {
- fclose(fd);
- return 1;
- }
- } else {
- /* we search a non empty pool or
- an ostname in a pool */
- if ((ostname == NULL) ||
- (strncmp(buffer, ostname, len) == 0)) {
- fclose(fd);
- return 1;
- }
- }
}
- fclose(fd);
- return 0;
-}
-
-static int check_pool_cmd(enum lcfg_command_type cmd,
- char *fsname, char *poolname,
- char *ostname)
-{
- int rc = 0;
switch (cmd) {
case LCFG_POOL_NEW: {
- if (search_ost(fsname, poolname, NULL) >= 0) {
+ LASSERT(ostname == NULL);
+ if (rc >= 0) {
fprintf(stderr, "Pool %s.%s already exists\n",
fsname, poolname);
return -EEXIST;
return 0;
}
case LCFG_POOL_DEL: {
- rc = search_ost(fsname, poolname, NULL);
- if (rc < 0) {
- fprintf(stderr, "Pool %s.%s not found\n",
- fsname, poolname);
- return -ENOENT;
- }
+ LASSERT(ostname == NULL);
if (rc == 1) {
fprintf(stderr, "Pool %s.%s not empty, "
"please remove all members\n",
return 0;
}
case LCFG_POOL_ADD: {
- rc = search_ost(fsname, NULL, ostname);
- if (rc == 0) {
- fprintf(stderr, "OST %s not found in lov of %s\n",
- ostname, fsname);
- return -ENOENT;
- }
- rc = search_ost(fsname, poolname, ostname);
- if (rc < 0) {
- fprintf(stderr, "Pool %s.%s not found\n",
- fsname, poolname);
- return -ENOENT;
- }
if (rc == 1) {
- fprintf(stderr, "OST %s already in pool %s.%s\n",
+ fprintf(stderr, "OST %s is already in pool %s.%s\n",
ostname, fsname, poolname);
return -EEXIST;
}
+ rc = llapi_search_ost(fsname, NULL, ostname);
+ if (rc == 0) {
+ fprintf(stderr, "OST %s is not part of the '%s' fs.\n",
+ ostname, fsname);
+ return -ENOENT;
+ }
return 0;
}
case LCFG_POOL_REM: {
- rc = search_ost(fsname, poolname, ostname);
- if (rc < 0) {
- fprintf(stderr, "Pool %s.%s not found\n",
- fsname, poolname);
- return -ENOENT;
- }
if (rc == 0) {
fprintf(stderr, "OST %s not found in pool %s.%s\n",
ostname, fsname, poolname);
}
return 0;
}
- default: {
- }
- }
- return 0;
+ default:
+ break;
+ } /* switch */
+ return -EINVAL;
}
-static void check_pool_cmd_result(enum lcfg_command_type cmd,
- char *fsname, char *poolname,
- char *ostname)
+/* This check only verifies that the changes have been "pushed out" to
+ the client successfully. This involves waiting for a config update,
+ and so may fail because of problems in that code or post-command
+ network loss. So reporting a warning is appropriate, but not a failure.
+*/
+static int check_pool_cmd_result(enum lcfg_command_type cmd,
+ char *fsname, char *poolname,
+ char *ostname)
{
- int cpt, rc = 0;
+ int cpt = 10;
+ int rc = 0;
- cpt = 10;
switch (cmd) {
case LCFG_POOL_NEW: {
do {
- rc = search_ost(fsname, poolname, NULL);
+ rc = llapi_search_ost(fsname, poolname, NULL);
+ if (rc == -ENODEV)
+ return rc;
if (rc < 0)
sleep(2);
cpt--;
} while ((rc < 0) && (cpt > 0));
- if (rc >= 0)
+ if (rc >= 0) {
fprintf(stderr, "Pool %s.%s created\n",
fsname, poolname);
- else
+ return 0;
+ } else {
fprintf(stderr, "Warning, pool %s.%s not found\n",
fsname, poolname);
- return;
+ return -ENOENT;
+ }
}
case LCFG_POOL_DEL: {
do {
- rc = search_ost(fsname, poolname, NULL);
- if (rc >= 0)
+ rc = llapi_search_ost(fsname, poolname, NULL);
+ if (rc == -ENODEV)
+ return rc;
+ if (rc >= 0)
sleep(2);
- cpt--;
+ cpt--;
} while ((rc >= 0) && (cpt > 0));
- if (rc < 0)
+ if (rc < 0) {
fprintf(stderr, "Pool %s.%s destroyed\n",
fsname, poolname);
- else
+ return 0;
+ } else {
fprintf(stderr, "Warning, pool %s.%s still found\n",
fsname, poolname);
- return;
+ return -EEXIST;
+ }
}
case LCFG_POOL_ADD: {
do {
- rc = search_ost(fsname, poolname, ostname);
+ rc = llapi_search_ost(fsname, poolname, ostname);
+ if (rc == -ENODEV)
+ return rc;
if (rc != 1)
sleep(2);
cpt--;
} while ((rc != 1) && (cpt > 0));
- if (rc == 1)
+ if (rc == 1) {
fprintf(stderr, "OST %s added to pool %s.%s\n",
ostname, fsname, poolname);
- else
+ return 0;
+ } else {
fprintf(stderr, "Warning, OST %s not found in pool %s.%s\n",
ostname, fsname, poolname);
- return;
+ return -ENOENT;
+ }
}
case LCFG_POOL_REM: {
do {
- rc = search_ost(fsname, poolname, ostname);
+ rc = llapi_search_ost(fsname, poolname, ostname);
+ if (rc == -ENODEV)
+ return rc;
if (rc == 1)
sleep(2);
cpt--;
} while ((rc == 1) && (cpt > 0));
- if (rc != 1)
+ if (rc != 1) {
fprintf(stderr, "OST %s removed from pool %s.%s\n",
ostname, fsname, poolname);
- else
+ return 0;
+ } else {
fprintf(stderr, "Warning, OST %s still found in pool %s.%s\n",
ostname, fsname, poolname);
- return;
- }
- default: {
+ return -EEXIST;
+ }
}
+ default:
+ break;
}
+ return -EINVAL;
}
static int check_and_complete_ostname(char *fsname, char *ostname)
struct obd_ioctl_data data;
struct lustre_cfg_bufs bufs;
struct lustre_cfg *lcfg;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
rc = check_pool_cmd(cmd, fsname, poolname, ostname);
- if (rc)
+ if (rc == -ENODEV)
+ fprintf(stderr, "Can't verify pool command since there "
+ "is no local MDT or client, proceeding anyhow...\n");
+ else if (rc)
return rc;
lustre_cfg_bufs_reset(&bufs, NULL);
return rc;
}
- IOC_INIT(data);
+ memset(&data, 0x00, sizeof(data));
rc = data.ioc_dev = get_mgs_device();
if (rc < 0)
goto out;
data.ioc_plen1 = lustre_cfg_len(lcfg->lcfg_bufcount,
lcfg->lcfg_buflens);
data.ioc_pbuf1 = (void *)lcfg;
- IOC_PACK(cmdname, data);
+ memset(buf, 0, sizeof(rawbuf));
+ rc = obd_ioctl_pack(&data, &buf, sizeof(rawbuf));
+ if (rc) {
+ fprintf(stderr, "error: %s: invalid ioctl\n",
+ jt_cmdname(cmdname));
+ return rc;
+ }
rc = l_ioctl(OBD_DEV_ID, OBD_IOC_POOL, buf);
out:
if (rc)
end++;
start++;
/* put in format the printf format (the rule without the range) */
- sprintf(format, "%s%%.4d%s", rule, end);
+ sprintf(format, "%s%%.4x%s", rule, end);
array_idx = 0;
array_sz = 0;
/* loop on , separator */
do {
/* extract the 3 fields */
- rc = sscanf(start, "%u-%u/%u", &lo, &hi, &step);
+ rc = sscanf(start, "%x-%x/%u", &lo, &hi, &step);
switch (rc) {
case 0: {
return 0;
rc = -EINVAL;
goto err;
}
- if (len > MAXPOOLNAME) {
+ if (len > LOV_MAXPOOLNAME) {
fprintf(stderr,
"poolname %s is too long (length is %d max is %d)\n",
- ptr + 1, len, MAXPOOLNAME);
+ ptr + 1, len, LOV_MAXPOOLNAME);
rc = -ENAMETOOLONG;
goto err;
}
- strncpy(poolname, ptr + 1, MAXPOOLNAME);
- poolname[MAXPOOLNAME] = '\0';
+ strncpy(poolname, ptr + 1, LOV_MAXPOOLNAME);
+ poolname[LOV_MAXPOOLNAME] = '\0';
*ptr = '\0';
return 0;
{
enum lcfg_command_type cmd;
char fsname[PATH_MAX + 1];
- char poolname[MAXPOOLNAME + 1];
+ char poolname[LOV_MAXPOOLNAME + 1];
char *ostnames_buf = NULL;
int i, rc;
int *array = NULL, array_sz;
if (rc)
break;
- rc = pool_cmd(cmd, argv[0], argv[1],
- fsname, poolname, NULL);
+ rc = pool_cmd(cmd, argv[0], argv[1], fsname, poolname, NULL);
if (rc)
break;
cmds[j].rc = pool_cmd(cmd, argv[0], argv[1],
fsname, poolname,
ostname);
+ /* Return an err if any of the add/dels fail */
+ if (!rc)
+ rc = cmds[j].rc;
}
for (j = 0; j < array_sz; j++) {
if (!cmds[j].rc) {
if (ostnames_buf);
free(ostnames_buf);
}
- return 0;
+ /* fall through */
}
- }
-
+ } /* switch */
out:
- if ((rc == -EINVAL) || (rc == -ENOENT))
- fprintf(stderr, "Does the fs, pool or ost exist?\n");
if (rc != 0) {
errno = -rc;
perror(argv[0]);
return rc;
}
+
+int jt_get_obj_version(int argc, char **argv)
+{
+ struct lu_fid fid;
+ struct obd_ioctl_data data;
+ __u64 version;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf, *fidstr;
+ int rc;
+
+ if (argc != 2)
+ return CMD_HELP;
+
+ fidstr = argv[1];
+ while (*fidstr == '[')
+ fidstr++;
+ sscanf(fidstr, SFID, RFID(&fid));
+ if (!fid_is_sane(&fid)) {
+ fprintf(stderr, "bad FID format [%s], should be "DFID"\n",
+ fidstr, (__u64)1, 2, 0);
+ return -EINVAL;
+ }
+
+ memset(&data, 0, sizeof data);
+ data.ioc_dev = cur_device;
+ data.ioc_inlbuf1 = (char *) &fid;
+ data.ioc_inllen1 = sizeof fid;
+ data.ioc_inlbuf2 = (char *) &version;
+ data.ioc_inllen2 = sizeof version;
+
+ memset(buf, 0, sizeof *buf);
+ 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));
+ return rc;
+ }
+
+ rc = l2_ioctl(OBD_DEV_ID, OBD_IOC_GET_OBJ_VERSION, buf);
+ if (rc == -1) {
+ fprintf(stderr, "error: %s: ioctl: %s\n",
+ jt_cmdname(argv[0]), strerror(errno));
+ return -errno;
+ }
+
+ obd_ioctl_unpack(&data, buf, sizeof rawbuf);
+ printf(LPX64"\n", version);
+ return 0;
+}
+
+void llapi_ping_target(char *obd_type, char *obd_name,
+ char *obd_uuid, void *args)
+{
+ int rc;
+ struct obd_ioctl_data data;
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+
+ memset(&data, 0, sizeof(data));
+ data.ioc_inlbuf4 = obd_name;
+ data.ioc_inllen4 = strlen(obd_name) + 1;
+ data.ioc_dev = OBD_DEV_BY_DEVNAME;
+ memset(buf, 0, sizeof(rawbuf));
+ if (obd_ioctl_pack(&data, &buf, sizeof(rawbuf))) {
+ fprintf(stderr, "error: invalid ioctl\n");
+ return;
+ }
+ rc = l_ioctl(OBD_DEV_ID, OBD_IOC_PING_TARGET, buf);
+ if (rc)
+ rc = errno;
+ if (rc == ENOTCONN || rc == ESHUTDOWN) {
+ printf("%s: INACTIVE\n", obd_name);
+ } else if (rc) {
+ printf("%s: check error: %s\n",
+ obd_name, strerror(errno));
+ } else {
+ printf("%s: active\n", obd_name);
+ }
+}
+
+int jt_changelog_register(int argc, char **argv)
+{
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+ struct obd_ioctl_data data;
+ char devname[30];
+ int rc;
+
+ if (argc > 2)
+ return CMD_HELP;
+ else if (argc == 2 && strcmp(argv[1], "-n") != 0)
+ return CMD_HELP;
+ if (cur_device < 0)
+ return CMD_HELP;
+
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_REG, buf);
+ if (rc < 0) {
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
+ strerror(rc = errno));
+ return rc;
+ }
+ obd_ioctl_unpack(&data, buf, sizeof(rawbuf));
+
+ 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 (argc == 2)
+ /* -n means bare name */
+ printf(CHANGELOG_USER_PREFIX"%u\n", data.ioc_u32_1);
+ else
+ printf("%s: Registered changelog userid '"CHANGELOG_USER_PREFIX
+ "%u'\n", devname, data.ioc_u32_1);
+ return 0;
+}
+
+int jt_changelog_deregister(int argc, char **argv)
+{
+ char rawbuf[MAX_IOC_BUFLEN], *buf = rawbuf;
+ struct obd_ioctl_data data;
+ char devname[30];
+ int id, rc;
+
+ if (argc != 2 || cur_device < 0)
+ return CMD_HELP;
+
+ id = strtol(argv[1] + strlen(CHANGELOG_USER_PREFIX), NULL, 10);
+ if ((id == 0) || (strncmp(argv[1], CHANGELOG_USER_PREFIX,
+ strlen(CHANGELOG_USER_PREFIX)) != 0)) {
+ fprintf(stderr, "expecting id of the form '"
+ CHANGELOG_USER_PREFIX"<num>'; got '%s'\n", argv[1]);
+ return CMD_HELP;
+ }
+
+ memset(&data, 0x00, sizeof(data));
+ data.ioc_dev = cur_device;
+ data.ioc_u32_1 = id;
+ 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 = l2_ioctl(OBD_DEV_ID, OBD_IOC_CHANGELOG_DEREG, buf);
+ if (rc < 0) {
+ fprintf(stderr, "error: %s: %s\n", jt_cmdname(argv[0]),
+ strerror(rc = errno));
+ return rc;
+ }
+ 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 (lcfg_get_devname() != NULL)
+ strcpy(devname, lcfg_get_devname());
+ else
+ sprintf(devname, "dev %d", cur_device);
+
+ printf("%s: Deregistered changelog user '"CHANGELOG_USER_PREFIX"%d'\n",
+ devname, data.ioc_u32_1);
+ return 0;
+}
+
+