From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14562 invoked by alias); 22 Oct 2009 17:45:25 -0000 Received: (qmail 14546 invoked by uid 9447); 22 Oct 2009 17:45:24 -0000 Date: Thu, 22 Oct 2009 17:45:00 -0000 Message-ID: <20091022174524.14544.qmail@sourceware.org> From: agk@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/lvm-functions.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2009-10/txt/msg00045.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: agk@sourceware.org 2009-10-22 17:45:24 Modified files: . : WHATS_NEW daemons/clvmd : lvm-functions.c Log message: Fix clvmd segfault when refresh_toolcontext fails. (brassow, bz 506986) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1300&r2=1.1301 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.69&r2=1.70 --- LVM2/WHATS_NEW 2009/10/22 17:33:09 1.1300 +++ LVM2/WHATS_NEW 2009/10/22 17:45:23 1.1301 @@ -1,5 +1,6 @@ Version 2.02.54 - ===================================== + Fix clvmd segfault when refresh_toolcontext fails. Remember to clear 'global lock held during cache refresh' state after use. Use udev flags support in LVM. Delay announcing mirror monitoring to syslog until initialisation succeeded. --- LVM2/daemons/clvmd/lvm-functions.c 2009/10/01 14:14:17 1.69 +++ LVM2/daemons/clvmd/lvm-functions.c 2009/10/22 17:45:24 1.70 @@ -601,20 +601,23 @@ int do_refresh_cache() { - int ret; DEBUGLOG("Refreshing context\n"); log_notice("Refreshing context"); pthread_mutex_lock(&lvm_lock); - ret = refresh_toolcontext(cmd); + if (!refresh_toolcontext(cmd)) { + pthread_mutex_unlock(&lvm_lock); + return -1; + } + init_full_scan_done(0); lvmcache_label_scan(cmd, 2); dm_pool_empty(cmd->mem); pthread_mutex_unlock(&lvm_lock); - return ret==1?0:-1; + return 0; }