From ec074fcf6470bd60813b4948befb6dff5c378f69 Mon Sep 17 00:00:00 2001 From: Christine Caulfield Date: Fri, 4 Apr 2008 08:53:47 +0000 Subject: [PATCH] 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. --- WHATS_NEW | 1 + daemons/clvmd/lvm-functions.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a85432c14..b7c701cac 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.34 - =================================== + Make clvmd refresh the context correctly when lvm.conf is updated. Add some basic internal VG lock validation. Add per-command flags to control which commands use the VG metadata cache. Fix vgsplit locking of new VG (2.02.30). diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 0428e9194..387a9803c 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -1,6 +1,6 @@ /* * 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. * @@ -318,7 +318,7 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource) pthread_mutex_lock(&lvm_lock); if (!cmd->config_valid || config_files_changed(cmd)) { /* Reinitialise various settings inc. logging, filters */ - if (!refresh_toolcontext(cmd)) { + if (do_refresh_cache()) { log_error("Updated config file invalid. Aborting."); pthread_mutex_unlock(&lvm_lock); return EINVAL; @@ -437,7 +437,7 @@ int post_lock_lv(unsigned char command, unsigned char lock_flags, 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 status;