* GPL HEADER END
*/
/*
- * Copyright (c) 2016, Intel Corporation.
+ * Copyright (c) 2017, Intel Corporation.
*
* lustre/utils/lsnapshot.c
*
#include <ctype.h>
#include <libcfs/util/list.h>
-#include <lustre_ioctl.h>
-#include <lustre/lustre_barrier_user.h>
+#include <libcfs/util/ioctl.h>
+#include <linux/lustre/lustre_ioctl.h>
+#include <linux/lustre/lustre_barrier_user.h>
#include "obdctl.h"
};
static const char snapshot_rsh_default[] = "ssh";
+static char snapshot_path[MAX_BUF_SIZE];
static char *snapshot_role2name(char *name, enum snapshot_role role,
__u32 index)
si->si_rsh, ## __VA_ARGS__); \
} while (0)
+#define DRSH "%s %s"
+#define DFSNAME "%s/%s"
+#define DSSNAME "%s/%s@%s"
+#define DZFS "%s zfs"
+#define DIMPORT "%s zpool import -d %s %s > /dev/null 2>&1"
+
+#define PRSH(si, st) (si)->si_rsh, (st)->st_host
+#define PFSNAME(st) (st)->st_pool, (st)->st_filesystem
+#define PSSNAME(si, st) PFSNAME(st), (si)->si_ssname
+#define PSS_NEW(si, st) PFSNAME(st), (si)->si_new_ssname
+#define PZFS(st) snapshot_path
+#define PIMPORT(st) snapshot_path, \
+ (st)->st_dir ? (st)->st_dir : "/dev -d /tmp", (st)->st_pool
+
char *snapshot_fgets(FILE *fp, char *buf, int buflen)
{
char *ptr;
/* Format of label:
* fsname-<role><index> or <role><index> */
- ptr = strchr(label, '-');
+ ptr = strrchr(label, '-');
if (ptr) {
if (strncmp(si->si_fsname, label, ptr - label) != 0) {
/* This line is NOT for current filesystem .*/
{
struct snapshot_target *st;
char *role = NULL;
+ char *path;
int rc = 0;
+ path = getenv("PATH");
+ if (!path)
+ return -EINVAL;
+
+ memset(snapshot_path, 0, sizeof(snapshot_path));
+ snprintf(snapshot_path, sizeof(snapshot_path) - 1, "PATH='%s'", path);
+
/* filter out space */
while (isspace(*buf))
buf++;
int len;
if (*dst && *dst != snapshot_rsh_default) {
- fprintf(stderr, "specify the %s repeatedly.\n", opt_name);
+ fprintf(stderr,
+ "%s option has been specified repeatedly.\n", opt_name);
return -EINVAL;
}
static int mdt0_is_lustre_snapshot(struct snapshot_instance *si)
{
+ struct snapshot_target *st = si->si_mdt0;
char buf[MAX_BUF_SIZE];
FILE *fp;
int rc;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1,
- "%s %s 'zpool import -d %s %s > /dev/null 2>&1; "
- "zfs get -H -o value lustre:magic %s/%s@%s'",
- si->si_rsh, si->si_mdt0->st_host,
- si->si_mdt0->st_dir ? si->si_mdt0->st_dir :
- "/dev -d /tmp",
- si->si_mdt0->st_pool, si->si_mdt0->st_pool,
- si->si_mdt0->st_filesystem, si->si_ssname);
+ DRSH" '"DIMPORT"; "DZFS
+ " get -H -o value lustre:magic "DSSNAME"'",
+ PRSH(si, st), PIMPORT(st), PZFS(st), PSSNAME(si, st));
fp = popen(buf, "r");
if (!fp) {
SNAPSHOT_ADD_LOG(si, "Popen fail to check snapshot "
int rc = 0;
memset(buf, 0, sizeof(buf));
- snprintf(buf, sizeof(buf) - 1, "%s %s 'mount'",
- si->si_rsh, st->st_host);
+ snprintf(buf, sizeof(buf) - 1,
+ DRSH" 'mount'",
+ PRSH(si, st));
fp = popen(buf, "r");
if (!fp) {
SNAPSHOT_ADD_LOG(si, "Popen fail to check target mount: %s\n",
memset(fullname, 0, sizeof(fullname));
if (ssname)
- snprintf(fullname, sizeof(fullname) - 1, "%s/%s@%s on ",
- st->st_pool, st->st_filesystem, ssname);
+ snprintf(fullname, sizeof(fullname) - 1,
+ DFSNAME"@%s on ",
+ PFSNAME(st), ssname);
else
- snprintf(fullname, sizeof(fullname) - 1, "%s/%s on ",
- st->st_pool, st->st_filesystem);
+ snprintf(fullname, sizeof(fullname) - 1,
+ DFSNAME" on ",
+ PFSNAME(st));
while (snapshot_fgets(fp, buf, sizeof(buf)) != NULL) {
ptr = strstr(buf, fullname);
static int snapshot_get_fsname(struct snapshot_instance *si,
char *fsname, int fslen)
{
+ struct snapshot_target *st = si->si_mdt0;
char buf[MAX_BUF_SIZE];
FILE *fp;
int rc = 0;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1,
- "%s %s 'zpool import -d %s %s > /dev/null 2>&1; "
- "zfs get -H -o value lustre:fsname %s/%s@%s'",
- si->si_rsh, si->si_mdt0->st_host,
- si->si_mdt0->st_dir ? si->si_mdt0->st_dir :
- "/dev -d /tmp",
- si->si_mdt0->st_pool, si->si_mdt0->st_pool,
- si->si_mdt0->st_filesystem, si->si_ssname);
+ DRSH" '"DIMPORT"; "DZFS
+ " get -H -o value lustre:fsname "DSSNAME"'",
+ PRSH(si, st), PIMPORT(st), PZFS(st), PSSNAME(si, st));
fp = popen(buf, "r");
if (!fp) {
SNAPSHOT_ADD_LOG(si, "Popen fail to get fsname: %s\n",
st_list);
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1,
- "%s %s 'zfs get -H -o value lustre:mgsnode %s/%s'",
- si->si_rsh, st->st_host, st->st_pool, st->st_filesystem);
+ DRSH" '"DZFS" get -H -o value lustre:mgsnode "DFSNAME"'",
+ PRSH(si, st), PZFS(st), PFSNAME(st));
fp = popen(buf, "r");
if (!fp) {
SNAPSHOT_ADD_LOG(si, "Popen fail to get mgsnode: %s\n",
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1,
- "%s %s 'zfs list %s/%s@%s 2>/dev/null'",
- si->si_rsh, st->st_host, st->st_pool,
- st->st_filesystem, si->si_ssname);
+ DRSH" '"DZFS" list "DSSNAME" 2>/dev/null'",
+ PRSH(si, st), PZFS(st), PSSNAME(si, st));
fp = popen(buf, "r");
if (!fp) {
SNAPSHOT_ADD_LOG(si, "Popen fail to create check: %s\n",
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1,
- "%s %s \"zpool import -d %s %s > /dev/null 2>&1; "
- "zfs get all %s/%s | grep lustre: | grep local$ | "
+ DRSH" \""DIMPORT"; "DZFS
+ " get all "DFSNAME" | grep lustre: | grep local$ | "
"awk '{ \\$1=\\\"\\\"; \\$NF=\\\"\\\"; print \\$0 }' | "
"sed -e 's/^ //'\"",
- si->si_rsh, st->st_host,
- st->st_dir ? st->st_dir : "/dev -d /tmp",
- st->st_pool, st->st_pool, st->st_filesystem);
+ PRSH(si, st), PIMPORT(st), PZFS(st), PFSNAME(st));
fp = popen(buf, "r");
if (!fp) {
SNAPSHOT_ADD_LOG(si, "Popen fail to list one: %s\n",
memset(cmd, 0, sizeof(cmd));
len = snprintf(cmd, sizeof(cmd) - 1,
- "%s %s 'zfs snapshot "
+ DRSH" '"DZFS" snapshot "
"-o lustre:fsname=%s "
"-o lustre:magic=%s "
"-o lustre:ctime=%llu "
"-o lustre:mtime=%llu ",
- si->si_rsh, st->st_host, fsname,
+ PRSH(si, st), PZFS(st), fsname,
SNAPSHOT_MAGIC, xtime, xtime);
if (len <= 0)
exit(-EOVERFLOW);
if (st->st_role & SR_OST)
rc = snprintf(cmd + len, sizeof(cmd) - len - 1,
"-o lustre:svname=%s-OST%04x "
- "-o lustre:mgsnode=%s %s/%s@%s'",
+ "-o lustre:mgsnode=%s "DSSNAME"'",
fsname, st->st_index, mgsnode,
- st->st_pool, st->st_filesystem,
- si->si_ssname);
+ PSSNAME(si, st));
else if (!(st->st_role & SR_MGS) ||
/* MGS is on MDT0 */
si->si_mdt0 == si->si_mgs)
rc = snprintf(cmd + len, sizeof(cmd) - len - 1,
"-o lustre:svname=%s-MDT%04x "
- "-o lustre:mgsnode=%s %s/%s@%s'",
+ "-o lustre:mgsnode=%s "DSSNAME"'",
fsname, st->st_index, mgsnode,
- st->st_pool, st->st_filesystem,
- si->si_ssname);
+ PSSNAME(si, st));
else
/* separated MGS */
rc = snprintf(cmd + len, sizeof(cmd) - len - 1,
- "%s/%s@%s'", st->st_pool,
- st->st_filesystem, si->si_ssname);
+ DSSNAME"'", PSSNAME(si, st));
if (rc <= 0)
exit(-EOVERFLOW);
return rc;
srandom(tv.tv_usec);
- snprintf(new_fsname, 8, "%08x", (__u32)random());
- new_fsname[8] = '\0';
+ snprintf(new_fsname, sizeof(new_fsname), "%08x", (__u32)random());
rc = snapshot_get_mgsnode(si, buf, sizeof(buf));
if (rc)
if (!rc && !rc1) {
struct barrier_ctl bc;
- __argv[0] = "barrier_stat";
- rc = __jt_barrier_stat(2, __argv, &bc);
+ rc = __jt_barrier_stat(__argv[1], &bc);
if (rc) {
SNAPSHOT_ADD_LOG(si, "Can't get barrier status "
"on %s: rc = %d\n",
int jt_snapshot_create(int argc, char **argv)
{
struct snapshot_instance *si;
- struct option lopts_create[] = {
- { "barrier", optional_argument, 0, 'b' },
- { "comment", required_argument, 0, 'c' },
- { "fsname", required_argument, 0, 'F' },
- { "help", no_argument, 0, 'h' },
- { "name", required_argument, 0, 'n' },
- { "rsh", required_argument, 0, 'r' },
- { "timeout", required_argument, 0, 't' },
- };
+ struct option long_opts[] = {
+ { .val = 'b', .name = "barrier", .has_arg = optional_argument },
+ { .val = 'c', .name = "comment", .has_arg = required_argument },
+ { .val = 'F', .name = "fsname", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'n', .name = "name", .has_arg = required_argument },
+ { .val = 'r', .name = "rsh", .has_arg = required_argument },
+ { .val = 't', .name = "timeout", .has_arg = required_argument },
+ { .name = NULL } };
int rc = 0;
- si = snapshot_init(argc, argv, lopts_create, "b::c:F:hn:r:t:",
+ si = snapshot_init(argc, argv, long_opts, "b::c:F:hn:r:t:",
snapshot_create_usage, LOCK_EX, &rc);
if (!si)
return rc;
memset(cmd, 0, sizeof(cmd));
if (si->si_force)
snprintf(cmd, sizeof(cmd) - 1,
- "%s %s 'umount -f %s/%s@%s "
- "> /dev/null 2>&1; "
- "zfs destroy -f %s/%s@%s'",
- si->si_rsh, st->st_host, st->st_pool,
- st->st_filesystem, si->si_ssname,
- st->st_pool, st->st_filesystem,
- si->si_ssname);
+ DRSH" 'umount -f "DSSNAME
+ " > /dev/null 2>&1; "DZFS
+ " destroy -f "DSSNAME"'",
+ PRSH(si, st), PSSNAME(si, st),
+ PZFS(st), PSSNAME(si, st));
else
snprintf(cmd, sizeof(cmd) - 1,
- "%s %s 'zfs destroy %s/%s@%s'",
- si->si_rsh, st->st_host, st->st_pool,
- st->st_filesystem, si->si_ssname);
+ DRSH" '"DZFS" destroy "DSSNAME"'",
+ PRSH(si, st), PZFS(st),
+ PSSNAME(si, st));
rc = snapshot_exec(cmd);
if (rc)
SNAPSHOT_ADD_LOG(si, "Can't execute \"%s\" on "
int jt_snapshot_destroy(int argc, char **argv)
{
struct snapshot_instance *si;
- struct option lopts_destroy[] = {
- { "force", no_argument, 0, 'f' },
- { "fsname", required_argument, 0, 'F' },
- { "help", no_argument, 0, 'h' },
- { "name", required_argument, 0, 'n' },
- { "rsh", required_argument, 0, 'r' },
- };
+ struct option long_opts[] = {
+ { .val = 'f', .name = "force", .has_arg = no_argument },
+ { .val = 'F', .name = "fsname", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'n', .name = "name", .has_arg = required_argument },
+ { .val = 'r', .name = "rsh", .has_arg = required_argument },
+ { .name = NULL } };
int rc = 0;
- si = snapshot_init(argc, argv, lopts_destroy, "fF:hn:r:",
+ si = snapshot_init(argc, argv, long_opts, "fF:hn:r:",
snapshot_destroy_usage, LOCK_EX, &rc);
if (!si)
return rc;
memset(cmd, 0, sizeof(cmd));
if (si->si_new_ssname && si->si_comment)
snprintf(cmd, sizeof(cmd) - 1,
- "%s %s 'zpool import -d %s %s > "
- "/dev/null 2>&1; "
- "zfs rename %s/%s@%s %s/%s@%s && "
- "zfs set lustre:comment=\"%s\" "
- "%s/%s@%s && "
- "zfs set lustre:mtime=%llu %s/%s@%s'",
- si->si_rsh, st->st_host,
- st->st_dir ? st->st_dir :
- "/dev -d /tmp",
- st->st_pool, st->st_pool,
- st->st_filesystem, si->si_ssname,
- st->st_pool, st->st_filesystem,
- si->si_new_ssname, si->si_comment,
- st->st_pool, st->st_filesystem,
- si->si_new_ssname, xtime,
- st->st_pool, st->st_filesystem,
- si->si_new_ssname);
+ DRSH" '"DIMPORT"; "DZFS" rename "
+ DSSNAME" "DSSNAME" && "DZFS
+ " set lustre:comment=\"%s\" "DSSNAME
+ " && "DZFS
+ " set lustre:mtime=%llu "DSSNAME"'",
+ PRSH(si, st), PIMPORT(st), PZFS(st),
+ PSSNAME(si, st), PSS_NEW(si, st),
+ PZFS(st), si->si_comment,
+ PSS_NEW(si, st), PZFS(st), xtime,
+ PSS_NEW(si, st));
else if (si->si_new_ssname)
snprintf(cmd, sizeof(cmd) - 1,
- "%s %s 'zpool import -d %s %s > "
- "/dev/null 2>&1; "
- "zfs rename %s/%s@%s %s/%s@%s && "
- "zfs set lustre:mtime=%llu %s/%s@%s'",
- si->si_rsh, st->st_host,
- st->st_dir ? st->st_dir :
- "/dev -d /tmp",
- st->st_pool, st->st_pool,
- st->st_filesystem, si->si_ssname,
- st->st_pool, st->st_filesystem,
- si->si_new_ssname, xtime, st->st_pool,
- st->st_filesystem, si->si_new_ssname);
+ DRSH" '"DIMPORT"; "DZFS
+ " rename "DSSNAME" "DSSNAME" && "DZFS
+ " set lustre:mtime=%llu "DSSNAME"'",
+ PRSH(si, st), PIMPORT(st), PZFS(st),
+ PSSNAME(si, st), PSS_NEW(si, st),
+ PZFS(st), xtime, PSS_NEW(si, st));
else if (si->si_comment)
snprintf(cmd, sizeof(cmd) - 1,
- "%s %s 'zpool import -d %s %s > "
- "/dev/null 2>&1; zfs set "
- "lustre:comment=\"%s\" %s/%s@%s && "
- "zfs set lustre:mtime=%llu %s/%s@%s'",
- si->si_rsh, st->st_host,
- st->st_dir ? st->st_dir :
- "/dev -d /tmp",
- st->st_pool, si->si_comment,
- st->st_pool, st->st_filesystem,
- si->si_ssname, xtime, st->st_pool,
- st->st_filesystem, si->si_ssname);
+ DRSH" '"DIMPORT"; "DZFS
+ " set lustre:comment=\"%s\" "DSSNAME
+ " && "DZFS
+ " set lustre:mtime=%llu "DSSNAME"'",
+ PRSH(si, st), PIMPORT(st), PZFS(st),
+ si->si_comment, PSSNAME(si, st),
+ PZFS(st), xtime, PSSNAME(si, st));
else
exit(-EINVAL);
int jt_snapshot_modify(int argc, char **argv)
{
struct snapshot_instance *si;
- struct option lopts_modify[] = {
- { "comment", required_argument, 0, 'c' },
- { "fsname", required_argument, 0, 'F' },
- { "help", no_argument, 0, 'h' },
- { "name", required_argument, 0, 'n' },
- { "new", required_argument, 0, 'N' },
- { "rsh", required_argument, 0, 'r' },
- };
+ struct option long_opts[] = {
+ { .val = 'c', .name = "comment", .has_arg = required_argument },
+ { .val = 'F', .name = "fsname", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'n', .name = "name", .has_arg = required_argument },
+ { .val = 'N', .name = "new", .has_arg = required_argument },
+ { .val = 'r', .name = "rsh", .has_arg = required_argument },
+ { .name = NULL } };
int rc = 0;
- si = snapshot_init(argc, argv, lopts_modify, "c:F:hn:N:r:",
+ si = snapshot_init(argc, argv, long_opts, "c:F:hn:N:r:",
snapshot_modify_usage, LOCK_EX, &rc);
if (!si)
return rc;
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1,
- "%s %s \"zpool import -d %s %s > /dev/null 2>&1; "
- "zfs get all %s/%s@%s | grep lustre: | grep local$ | "
+ DRSH" \""DIMPORT"; "DZFS
+ " get all "DSSNAME" | grep lustre: | grep local$ | "
"awk '{ \\$1=\\\"\\\"; \\$NF=\\\"\\\"; print \\$0 }' | "
"sed -e 's/^ //'\"",
- si->si_rsh, st->st_host,
- st->st_dir ? st->st_dir : "/dev -d /tmp",
- st->st_pool, st->st_pool, st->st_filesystem, si->si_ssname);
+ PRSH(si, st), PIMPORT(st), PZFS(st), PSSNAME(si, st));
fp = popen(buf, "r");
if (!fp) {
SNAPSHOT_ADD_LOG(si, "Popen fail to list one: %s\n",
static int snapshot_list_all(struct snapshot_instance *si)
{
+ struct snapshot_target *st = si->si_mdt0;
struct list_sub_item {
struct list_head lsi_list;
char lsi_ssname[0];
INIT_LIST_HEAD(&list_sub_items);
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1,
- "%s %s \"zfs get -H -r lustre:magic %s/%s | "
- "grep %s | awk '{ print \\$1 }' | cut -d@ -f2\"",
- si->si_rsh, si->si_mdt0->st_host, si->si_mdt0->st_pool,
- si->si_mdt0->st_filesystem, SNAPSHOT_MAGIC);
+ DRSH" \""DZFS" get -H -r lustre:magic "DFSNAME
+ " | grep %s | awk '{ print \\$1 }' | cut -d@ -f2\"",
+ PRSH(si, st), PZFS(st), PFSNAME(st), SNAPSHOT_MAGIC);
fp = popen(buf, "r");
if (!fp) {
SNAPSHOT_ADD_LOG(si, "Popen fail to list ssnames: %s\n",
int jt_snapshot_list(int argc, char **argv)
{
struct snapshot_instance *si;
- struct option lopts_list[] = {
- { "detail", no_argument, 0, 'd' },
- { "fsname", required_argument, 0, 'F' },
- { "help", no_argument, 0, 'h' },
- { "name", required_argument, 0, 'n' },
- { "rsh", required_argument, 0, 'r' },
- };
+ struct option long_opts[] = {
+ { .val = 'd', .name = "detail", .has_arg = no_argument },
+ { .val = 'F', .name = "fsname", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'n', .name = "name", .has_arg = required_argument },
+ { .val = 'r', .name = "rsh", .has_arg = required_argument },
+ { .name = NULL } };
int rc = 0;
- si = snapshot_init(argc, argv, lopts_list, "dF:hn:r:",
+ si = snapshot_init(argc, argv, long_opts, "dF:hn:r:",
snapshot_list_usage, LOCK_SH, &rc);
if (!si)
return rc;
memset(name, 0, sizeof(name));
snapshot_role2name(name, st->st_role, st->st_index);
snprintf(cmd, sizeof(cmd) - 1,
- "%s %s 'zpool import -d %s %s > /dev/null 2>&1; "
- "mkdir -p /mnt/%s_%s && mount -t lustre "
- "-o rdonly_dev%s %s/%s@%s /mnt/%s_%s'",
- si->si_rsh, st->st_host,
- st->st_dir ? st->st_dir : "/dev -d /tmp",
- st->st_pool, si->si_ssname, name,
- st != si->si_mdt0 ? "" : optstr,
- st->st_pool, st->st_filesystem, si->si_ssname,
+ DRSH" '"DIMPORT"; mkdir -p /mnt/%s_%s && mount -t lustre "
+ "-o rdonly_dev%s "DSSNAME" /mnt/%s_%s'",
+ PRSH(si, st), PIMPORT(st), si->si_ssname, name,
+ st != si->si_mdt0 ? "" : optstr, PSSNAME(si, st),
si->si_ssname, name);
rc = snapshot_exec(cmd);
if (rc)
int jt_snapshot_mount(int argc, char **argv)
{
struct snapshot_instance *si;
- struct option lopts_mount[] = {
- { "fsname", required_argument, 0, 'F' },
- { "help", no_argument, 0, 'h' },
- { "name", required_argument, 0, 'n' },
- { "rsh", required_argument, 0, 'r' },
- };
+ struct option long_opts[] = {
+ { .val = 'F', .name = "fsname", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'n', .name = "name", .has_arg = required_argument },
+ { .val = 'r', .name = "rsh", .has_arg = required_argument },
+ { .name = NULL } };
int rc = 0;
- si = snapshot_init(argc, argv, lopts_mount, "F:hn:r:",
+ si = snapshot_init(argc, argv, long_opts, "F:hn:r:",
snapshot_mount_usage, LOCK_EX, &rc);
if (!si)
return rc;
memset(cmd, 0, sizeof(cmd));
snprintf(cmd, sizeof(cmd) - 1,
- "%s %s 'umount %s/%s@%s'",
- si->si_rsh, st->st_host, st->st_pool,
- st->st_filesystem, si->si_ssname);
+ DRSH" 'umount "DSSNAME"'",
+ PRSH(si, st), PSSNAME(si, st));
rc = snapshot_exec(cmd);
exit(rc);
int jt_snapshot_umount(int argc, char **argv)
{
struct snapshot_instance *si;
- struct option lopts_umount[] = {
- { "fsname", required_argument, 0, 'F' },
- { "help", no_argument, 0, 'h' },
- { "name", required_argument, 0, 'n' },
- { "rsh", required_argument, 0, 'r' },
- };
+ struct option long_opts[] = {
+ { .val = 'F', .name = "fsname", .has_arg = required_argument },
+ { .val = 'h', .name = "help", .has_arg = no_argument },
+ { .val = 'n', .name = "name", .has_arg = required_argument },
+ { .val = 'r', .name = "rsh", .has_arg = required_argument },
+ { .name = NULL } };
int rc = 0;
- si = snapshot_init(argc, argv, lopts_umount, "F:hn:r:",
+ si = snapshot_init(argc, argv, long_opts, "F:hn:r:",
snapshot_umount_usage, LOCK_EX, &rc);
if (!si)
return rc;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff