From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13683 invoked by alias); 14 Mar 2008 15:39:39 -0000 Received: (qmail 13530 invoked by uid 9453); 14 Mar 2008 15:39:35 -0000 Date: Fri, 14 Mar 2008 15:39:00 -0000 Message-ID: <20080314153935.13515.qmail@sourceware.org> From: teigland@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. gfs-kernel_0_1_22-72-g48f2090 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 49a5ca7296ad07833e647391380b7786b78a41df X-Git-Newrev: 48f20902219251eacf28ec99bc98a17bff192e71 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-q1/txt/msg00314.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=48f20902219251eacf28ec99bc98a17bff192e71 The branch, master has been updated via 48f20902219251eacf28ec99bc98a17bff192e71 (commit) from 49a5ca7296ad07833e647391380b7786b78a41df (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 48f20902219251eacf28ec99bc98a17bff192e71 Author: David Teigland Date: Fri Mar 14 10:36:54 2008 -0500 libdlm: fix lvb copying When a program does a lock operation that reads an lvb, libdlm copies the lvb data from a bogus location instead of from the proper offset in the buffer it just read. The location of the lvb data is calculated wrongly due to a missing cast. Signed-off-by: David Teigland ----------------------------------------------------------------------- Summary of changes: dlm/lib/libdlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlm/lib/libdlm.c b/dlm/lib/libdlm.c index 7464085..d182095 100644 --- a/dlm/lib/libdlm.c +++ b/dlm/lib/libdlm.c @@ -573,7 +573,7 @@ static int do_dlm_dispatch_v6(int fd) /* Copy lvb to user's buffer */ if (result->lvb_offset) memcpy(result->user_lksb->sb_lvbptr, - result + result->lvb_offset, DLM_LVB_LEN); + (char *)result + result->lvb_offset, DLM_LVB_LEN); result->user_lksb->sb_status = -result->user_lksb->sb_status; hooks/post-receive -- Cluster Project