From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 12 Jun 2008 07:39:08 -0000 Subject: [Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-3-ga48fcfe Message-ID: <20080612073908.18825.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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=a48fcfecbb971f65c3f3e6296f9e40419dd3e035 The branch, STABLE2 has been updated via a48fcfecbb971f65c3f3e6296f9e40419dd3e035 (commit) from efc738457115b7a29adcbc4667234b02eb45ba29 (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 a48fcfecbb971f65c3f3e6296f9e40419dd3e035 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 8eb6eef..b174822 100644 --- a/cman/qdisk/scandisk.c +++ b/cman/qdisk/scandisk.c @@ -571,7 +571,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