[Cluster-devel] cluster/dlm/tool main.c

[teigland]

CVSROOT:        /cvs/cluster
Module name:    cluster
Changes by:     [EMAIL PROTECTED]       2007-08-20 20:31:02

Modified files:
        dlm/tool       : main.c 

Log message:
        the NODIR new_lockspace flag was always being used, even if the -d
        was used to deselect it

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/main.c.diff?cvsroot=cluster&r1=1.5&r2=1.6

--- cluster/dlm/tool/main.c     2007/07/24 18:17:31     1.5
+++ cluster/dlm/tool/main.c     2007/08/20 20:31:01     1.6
@@ -195,11 +195,15 @@
 void do_join(char *name)
 {
        dlm_lshandle_t *dh;
+       uint32_t flags = 0;
 
        printf("Joining lockspace \"%s\", permission %o\n", name, create_mode);
        fflush(stdout);
 
-       dh = dlm_new_lockspace(name, 0600, DLM_LSFL_NODIR);
+       if (!opt_dir)
+               flags = DLM_LSFL_NODIR;
+
+       dh = dlm_new_lockspace(name, 0600, flags);
        if (!dh) {
                fprintf(stderr, "dlm_new_lockspace %s error %p %d\n",
                        name, dh, errno);