← Back to branch summary

~ubuntu-branches/debian/sid/lvm2/sid

« back to all changes in this revision

Viewing changes to daemons/clvmd/lvm-functions.c

  • Committer: Package Import Robot
  • Author(s): Bastian Blank
  • Date: 2015-08-15 11:58:45 UTC
  • mto: This revision was merged to the branch mainline in revision 51.
  • Revision ID: package-import@ubuntu.com-20150815115845-a01iqjj9qcb8rmut
Tags: upstream-2.02.127
Import upstream version 2.02.127

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemons/clvmd/lvm-functions.c
510
510
        DEBUGLOG("do_lock_lv: resource '%s', cmd = %s, flags = %s, critical_section = %d\n",
511
511
                 resource, decode_locking_cmd(command), decode_flags(lock_flags), critical_section());
512
512
 
513
 
        if (!cmd->config_initialized || config_files_changed(cmd)) {
 
513
        if (!cmd->initialized.config || config_files_changed(cmd)) {
514
514
                /* Reinitialise various settings inc. logging, filters */
515
515
                if (do_refresh_cache()) {
516
516
                        log_error("Updated config file invalid. Aborting.");
899
899
        if (!get_initial_state(excl_uuid))
900
900
                log_error("Cannot load initial lock states.");
901
901
 
902
 
        if (!(cmd = create_toolcontext(1, NULL, 0, 1))) {
 
902
        if (!(cmd = create_toolcontext(1, NULL, 0, 1, 1, 1))) {
903
903
                log_error("Failed to allocate command context");
904
904
                return 0;
905
905
        }