This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - dlm_tool: use NEWEXCL flag
- From: David Teigland <teigland at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Tue, 13 Jan 2009 19:41:09 +0000 (UTC)
- Subject: cluster: STABLE3 - dlm_tool: use NEWEXCL flag
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f4fcaad172669a2a5fac9bf9c88578f413fe9232
Commit: f4fcaad172669a2a5fac9bf9c88578f413fe9232
Parent: 011c1337f126f1eb82bb380898c251af68d3bcec
Author: David Teigland <teigland@redhat.com>
AuthorDate: Tue Jan 13 13:36:40 2009 -0600
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Tue Jan 13 13:40:47 2009 -0600
dlm_tool: use NEWEXCL flag
Use the DLM_LSFL_NEWEXCL flag that was added in 2.6.28.
Signed-off-by: David Teigland <teigland@redhat.com>
---
dlm/tool/main.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/dlm/tool/main.c b/dlm/tool/main.c
index 40fea07..d055b69 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -123,9 +123,7 @@ static void print_usage(void)
printf("Options:\n");
printf(" -n Show all node information in ls\n");
printf(" -d <n> Resource directory off/on (0/1) in join, default 0\n");
-#ifdef LINUX2628rc
printf(" -e <n> Exclusive create off/on (0/1) in join, default 0\n");
-#endif
printf(" -f <n> FS memory allocation off/on (0/1) in join, default 0\n");
printf(" -m <mode> Permission mode for lockspace device (octal), default 0600\n");
printf(" -M Print MSTCPY locks in lockdump\n"
@@ -333,10 +331,8 @@ static char *flag_str(uint32_t flags)
if (flags & DLM_LSFL_NODIR)
strcat(join_flags, "NODIR ");
-#ifdef LINUX2628rc
if (flags & DLM_LSFL_NEWEXCL)
strcat(join_flags, "NEWEXCL ");
-#endif
if (flags & DLM_LSFL_FS)
strcat(join_flags, "FS ");
@@ -352,10 +348,8 @@ void do_join(char *name)
if (!opt_dir)
flags |= DLM_LSFL_NODIR;
-#ifdef LINUX2628rc
if (opt_excl)
flags |= DLM_LSFL_NEWEXCL;
-#endif
if (opt_fs)
flags |= DLM_LSFL_FS;