1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00

If lvm.conf was touched, clvmd attempted to update the toolcontext

but only did half of the job. It now shares the do_refresh_cache()
function that vgscan invokes.
This commit is contained in:
Christine Caulfield 2008-04-04 08:53:47 +00:00
parent 906935e580
commit ec074fcf64
2 changed files with 4 additions and 3 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.34 - Version 2.02.34 -
=================================== ===================================
Make clvmd refresh the context correctly when lvm.conf is updated.
Add some basic internal VG lock validation. Add some basic internal VG lock validation.
Add per-command flags to control which commands use the VG metadata cache. Add per-command flags to control which commands use the VG metadata cache.
Fix vgsplit locking of new VG (2.02.30). Fix vgsplit locking of new VG (2.02.30).

View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
* Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
* *
* This file is part of LVM2. * This file is part of LVM2.
* *
@ -318,7 +318,7 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
pthread_mutex_lock(&lvm_lock); pthread_mutex_lock(&lvm_lock);
if (!cmd->config_valid || config_files_changed(cmd)) { if (!cmd->config_valid || config_files_changed(cmd)) {
/* Reinitialise various settings inc. logging, filters */ /* Reinitialise various settings inc. logging, filters */
if (!refresh_toolcontext(cmd)) { if (do_refresh_cache()) {
log_error("Updated config file invalid. Aborting."); log_error("Updated config file invalid. Aborting.");
pthread_mutex_unlock(&lvm_lock); pthread_mutex_unlock(&lvm_lock);
return EINVAL; return EINVAL;
@ -437,7 +437,7 @@ int post_lock_lv(unsigned char command, unsigned char lock_flags,
return 0; return 0;
} }
/* Check if a VG is un use by LVM1 so we don't stomp on it */ /* Check if a VG is in use by LVM1 so we don't stomp on it */
int do_check_lvm1(const char *vgname) int do_check_lvm1(const char *vgname)
{ {
int status; int status;