diff options
| author | Christine Caulfield <ccaulfie@redhat.com> | 2008-04-04 08:53:47 +0000 |
|---|---|---|
| committer | Christine Caulfield <ccaulfie@redhat.com> | 2008-04-04 08:53:47 +0000 |
| commit | ec074fcf6470bd60813b4948befb6dff5c378f69 (patch) | |
| tree | bbf0fde67966585fd62b22c39560b72845ca3861 /daemons/clvmd/lvm-functions.c | |
| parent | 906935e580452594d303f5c35c3da5d05811d591 (diff) | |
| download | lvm2-ec074fcf6470bd60813b4948befb6dff5c378f69.tar.gz lvm2-ec074fcf6470bd60813b4948befb6dff5c378f69.tar.xz lvm2-ec074fcf6470bd60813b4948befb6dff5c378f69.zip | |
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.
Diffstat (limited to 'daemons/clvmd/lvm-functions.c')
| -rw-r--r-- | daemons/clvmd/lvm-functions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 0428e919..387a9803 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; |