[DRBD-cvs] drbd by phil; Lars sent these two. * Fix to drbdsetup ...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd_fs.c drbd_main.c 


Log Message:
Lars sent these two. 
* Fix to drbdsetup /dev/nbx show -> Kernel OOPS
* Did not compile on 2.4 if CONFIG_DEVFS was not set

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_fs.c,v
retrieving revision 1.28.2.59
retrieving revision 1.28.2.60
diff -u -3 -r1.28.2.59 -r1.28.2.60
--- drbd_fs.c	1 Feb 2004 18:15:08 -0000	1.28.2.59
+++ drbd_fs.c	2 Feb 2004 12:44:00 -0000	1.28.2.60
@@ -351,10 +351,14 @@
 	struct ioctl_get_config cn;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-	cn.lower_device_major=MAJOR(mdev->backing_bdev->bd_dev);
-	cn.lower_device_minor=MINOR(mdev->backing_bdev->bd_dev);
-	cn.meta_device_major=MAJOR(mdev->md_bdev->bd_dev);
-	cn.meta_device_minor=MINOR(mdev->md_bdev->bd_dev);
+	cn.lower_device_major = MAJOR(mdev->backing_bdev ?
+				      mdev->backing_bdev->bd_dev : 0);
+	cn.lower_device_minor = MINOR(mdev->backing_bdev ?
+				      mdev->backing_bdev->bd_dev : 0);
+	cn.meta_device_major  = MAJOR(mdev->md_bdev ?
+				      mdev->md_bdev->bd_dev : 0);
+	cn.meta_device_minor  = MINOR(mdev->md_bdev ?
+				      mdev->md_bdev->bd_dev : 0);
 #else
 	cn.lower_device_major=MAJOR(mdev->lo_device);
 	cn.lower_device_minor=MINOR(mdev->lo_device);
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_main.c,v
retrieving revision 1.73.2.119
retrieving revision 1.73.2.120
diff -u -3 -r1.73.2.119 -r1.73.2.120
--- drbd_main.c	1 Feb 2004 12:09:31 -0000	1.73.2.119
+++ drbd_main.c	2 Feb 2004 12:44:00 -0000	1.73.2.120
@@ -70,7 +70,7 @@
 #include "drbd.h"
 #include "drbd_int.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) && defined (CONFIG_DEVFS_FS)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 static devfs_handle_t devfs_handle;
 #endif