Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 77565cca9f99167e1aa04b7608afd9b8f60f1bee
Parent: 9832cc8a622c195701ca28127c261aec8832c7e6
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue May 1 11:16:32 2012 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue May 1 11:16:32 2012 -0500
libdlm/dlm_tool: remove NODIR flag
NODIR is no longer configured with an api flag,
but is configured by dlm_controld through sysfs.
Signed-off-by: David Teigland <teigland(a)redhat.com>
---
dlm_tool/main.c | 14 +-------------
libdlm/libdlm.h | 1 -
libdlm/man/dlm_create_lockspace.3 | 1 -
3 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/dlm_tool/main.c b/dlm_tool/main.c
index 1ffd788..36f8bf8 100644
--- a/dlm_tool/main.c
+++ b/dlm_tool/main.c
@@ -47,7 +47,6 @@ static char *lsname;
static int operation;
static int opt_ind;
static int ls_all_nodes = 0;
-static int opt_dir = 0;
static int opt_excl = 0;
static int opt_fs = 0;
static int dump_mstcpy = 0;
@@ -192,7 +191,6 @@ static void print_usage(void)
printf("\n");
printf("Options:\n");
printf(" -n Show all node information in ls\n");
- printf(" -d 0|1 Resource directory off/on in join, default 0\n");
printf(" -e 0|1 Exclusive create off/on in join, default 0\n");
printf(" -f 0|1 FS (filesystem) flag off/on in join, default
0\n");
printf(" -m <mode> Permission mode for lockspace device (octal),
default 0600\n");
@@ -204,7 +202,7 @@ static void print_usage(void)
printf("\n");
}
-#define OPTION_STRING "MhVnd:m:e:f:vws"
+#define OPTION_STRING "MhVnm:e:f:vws"
static void decode_arguments(int argc, char **argv)
{
@@ -217,10 +215,6 @@ static void decode_arguments(int argc, char **argv)
optchar = getopt(argc, argv, OPTION_STRING);
switch (optchar) {
- case 'd':
- opt_dir = atoi(optarg);
- break;
-
case 'e':
opt_excl = atoi(optarg);
break;
@@ -418,9 +412,6 @@ static char *flag_str(uint32_t flags)
strcat(join_flags, "flags ");
- if (flags & DLM_LSFL_NODIR)
- strcat(join_flags, "NODIR ");
-
if (flags & DLM_LSFL_NEWEXCL)
strcat(join_flags, "NEWEXCL ");
@@ -435,9 +426,6 @@ static void do_join(char *name)
dlm_lshandle_t *dh;
uint32_t flags = 0;
- if (!opt_dir)
- flags |= DLM_LSFL_NODIR;
-
if (opt_excl)
flags |= DLM_LSFL_NEWEXCL;
diff --git a/libdlm/libdlm.h b/libdlm/libdlm.h
index 7b6e681..d025ef8 100644
--- a/libdlm/libdlm.h
+++ b/libdlm/libdlm.h
@@ -42,7 +42,6 @@ struct dlm_lksb {
#define DLM_SBF_ALTMODE 0x04
/* dlm_new_lockspace flags */
-#define DLM_LSFL_NODIR 0x00000001
#define DLM_LSFL_TIMEWARN 0x00000002
#define DLM_LSFL_FS 0x00000004
#define DLM_LSFL_NEWEXCL 0x00000008
diff --git a/libdlm/man/dlm_create_lockspace.3 b/libdlm/man/dlm_create_lockspace.3
index 3879e85..93ffc54 100644
--- a/libdlm/man/dlm_create_lockspace.3
+++ b/libdlm/man/dlm_create_lockspace.3
@@ -45,7 +45,6 @@ Performs the same function as
.B dlm_create_lockspace()
above, but passes some creation flags to the call that affect the lockspace being
created. Currently supported flags are:
.nf
-DLM_LSFL_NODIR the lockspace should not use a resource directory
DLM_LSFL_TIMEWARN the dlm should emit warnings over netlink when locks
have been waiting too long; required for deadlock
detection