From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6030 invoked by alias); 23 Jul 2008 20:14:39 -0000 Received: (qmail 5999 invoked by uid 9478); 23 Jul 2008 20:14:38 -0000 Date: Wed, 23 Jul 2008 20:14:00 -0000 Message-ID: <20080723201438.5981.qmail@sourceware.org> From: jbrassow@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-163-g613d974 X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 9567fe17bf33eb0008831551b76c7f46c55ba40b X-Git-Newrev: 613d97438673200c87e4b07e3c4ee659c01acf65 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00128.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=613d97438673200c87e4b07e3c4ee659c01acf65 The branch, RHEL5 has been updated via 613d97438673200c87e4b07e3c4ee659c01acf65 (commit) from 9567fe17bf33eb0008831551b76c7f46c55ba40b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 613d97438673200c87e4b07e3c4ee659c01acf65 Author: Jonathan Brassow Date: Wed Jul 23 15:12:24 2008 -0500 dm-log-clustered: Fix bug 445456 I was resetting some common memory outside of the protection of a lock. ----------------------------------------------------------------------- Summary of changes: cmirror-kernel/src/dm-clog-tfr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmirror-kernel/src/dm-clog-tfr.c b/cmirror-kernel/src/dm-clog-tfr.c index 7932f77..7bd30fa 100644 --- a/cmirror-kernel/src/dm-clog-tfr.c +++ b/cmirror-kernel/src/dm-clog-tfr.c @@ -173,8 +173,7 @@ int dm_clog_consult_server(const char *uuid, int request_type, DMINFO("Size of tfr exceeds preallocated size"); /* FIXME: is kmalloc sufficient if we need this much space? */ tfr = kzalloc(data_size + sizeof(*tfr), GFP_NOIO); - } else - memset(tfr, 0, DM_CLOG_PREALLOCED_SIZE - overhead_size); + } if (!tfr) return -ENOMEM; @@ -188,6 +187,7 @@ resend: */ mutex_lock(&_lock); + memset(tfr, 0, DM_CLOG_PREALLOCED_SIZE - overhead_size); memcpy(tfr->uuid, uuid, DM_UUID_LEN); tfr->seq = seq++; tfr->request_type = request_type; hooks/post-receive -- Cluster Project