From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13062 invoked by alias); 12 Jun 2008 19:25:29 -0000 Received: (qmail 13027 invoked by uid 9476); 12 Jun 2008 19:25:28 -0000 Date: Thu, 12 Jun 2008 19:25:00 -0000 Message-ID: <20080612192528.13006.qmail@sourceware.org> From: lhh@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-115-gce02cca X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 6f5127de838baf655212e2122b44823fc75da452 X-Git-Newrev: ce02ccaa6fdbb1192c5e9714c06347f7f37bf0de 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-q2/txt/msg00487.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=ce02ccaa6fdbb1192c5e9714c06347f7f37bf0de The branch, RHEL5 has been updated via ce02ccaa6fdbb1192c5e9714c06347f7f37bf0de (commit) from 6f5127de838baf655212e2122b44823fc75da452 (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 ce02ccaa6fdbb1192c5e9714c06347f7f37bf0de Author: Fabio M. Di Nitto Date: Thu Jun 12 09:36:16 2008 +0200 [QDISK] Add better support for Xen virtual block devices This change allows to detect Xen virtual disks directly into sysfsattrs.disk without the need of an external filter. Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: cman/qdisk/scandisk.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/cman/qdisk/scandisk.c b/cman/qdisk/scandisk.c index 77484f6..ee7ce7f 100644 --- a/cman/qdisk/scandisk.c +++ b/cman/qdisk/scandisk.c @@ -590,7 +590,17 @@ static int sysfs_is_disk(char *path) snprintf(newpath, sizeof(newpath), "%s/../device/media", path); if (lstat(newpath, &sb)) - return -1; + goto found; + + snprintf(newpath, sizeof(newpath), "%s/device/devtype", path); + if (lstat(newpath, &sb)) + return 1; + + snprintf(newpath, sizeof(newpath), "%s/../device/devtype", path); + if (lstat(newpath, &sb)) + return 1; + + return -1; found: f = fopen(newpath, "r"); hooks/post-receive -- Cluster Project