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

[teigland]

CVSROOT:        /cvs/cluster
Module name:    cluster
Branch:         RHEL5
Changes by:     [EMAIL PROTECTED]       2007-08-20 20:38:37

Modified files:
        dlm/tool       : main.c 

Log message:
        the mode (-m) and directory (-d) options were being set but not
        used in the call to dlm_new_lockspace()

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/main.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.3&r2=1.2.2.4

--- cluster/dlm/tool/main.c     2007/07/19 20:43:24     1.2.2.3
+++ cluster/dlm/tool/main.c     2007/08/20 20:38:37     1.2.2.4
@@ -200,11 +200,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, create_mode, flags);
        if (!dh) {
                fprintf(stderr, "dlm_new_lockspace %s error %p %d\n",
                        name, dh, errno);