From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28964 invoked by alias); 5 Mar 2010 15:14:05 -0000 Received: (qmail 28938 invoked by uid 9737); 5 Mar 2010 15:14:04 -0000 Date: Fri, 05 Mar 2010 15:14:00 -0000 Message-ID: <20100305151404.28936.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/lib/mm memlock.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: 2010-03/txt/msg00017.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2010-03-05 15:14:04 Modified files: lib/mm : memlock.c Log message: Use '_' prefix for local static variable. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mm/memlock.c.diff?cvsroot=lvm2&r1=1.16&r2=1.17 --- LVM2/lib/mm/memlock.c 2010/03/05 14:48:34 1.16 +++ LVM2/lib/mm/memlock.c 2010/03/05 15:14:03 1.17 @@ -79,7 +79,7 @@ size_t w_size; size_t x_size; }; -static struct maps_stats ms; /* statistic for maps locking */ +static struct maps_stats _ms; /* statistic for maps locking */ static void _touch_memory(void *mem, size_t size) { @@ -251,8 +251,8 @@ { _allocate_memory(); - memset(&ms, 0, sizeof(ms)); - if (_memlock_maps(cmd, LVM_MLOCK, &ms)) + memset(&_ms, 0, sizeof(_ms)); + if (_memlock_maps(cmd, LVM_MLOCK, &_ms)) log_very_verbose("Locking memory"); errno = 0; @@ -271,9 +271,9 @@ if (_memlock_maps(cmd, LVM_MUNLOCK, &ums)) log_very_verbose("Unlocking memory"); - if (memcmp(&ms, &ums, sizeof(ms))) + if (memcmp(&_ms, &ums, sizeof(ums))) log_error(INTERNAL_ERROR "Maps size mismatch (%ld,%ld,%ld) != (%ld,%ld,%ld)", - (long)ms.r_size, (long)ms.w_size, (long)ms.x_size, + (long)_ms.r_size, (long)_ms.w_size, (long)_ms.x_size, (long)ums.r_size, (long)ums.w_size, (long)ums.x_size); _release_memory();