Cluster Project branch, master, updated. cluster-2.99.04-15-g8c4044a

Cluster Project branch, master, updated. cluster-2.99.04-15-g8c4044a

[fabbione]

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=8c4044a4131dbf70a0f276fdb7b5261f1e37d980

The branch, master has been updated
       via  8c4044a4131dbf70a0f276fdb7b5261f1e37d980 (commit)
      from  21908be38d42d2186378100ec6d22922662da469 (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 8c4044a4131dbf70a0f276fdb7b5261f1e37d980
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
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 <fdinitto@redhat.com>

-----------------------------------------------------------------------

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 84ab18e..820f63e 100644
--- a/cman/qdisk/scandisk.c
+++ b/cman/qdisk/scandisk.c
@@ -580,7 +580,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