[DRBD-cvs] drbd by phil; Micro fixes to drbd on L26.

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


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


Log Message:
Micro fixes to drbd on L26. 

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_compat_wrappers.h,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -3 -r1.1.2.14 -r1.1.2.15
--- drbd_compat_wrappers.h	27 Jan 2004 15:51:36 -0000	1.1.2.14
+++ drbd_compat_wrappers.h	30 Jan 2004 20:12:34 -0000	1.1.2.15
@@ -305,7 +305,6 @@
 static inline unsigned long drbd_get_my_capacity(drbd_dev *mdev)
 {
 	sector_t c = get_capacity(mdev->vdisk);
-	D_ASSERT(c == mdev->la_size);
 	return c;
 }
 
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_fs.c,v
retrieving revision 1.28.2.56
retrieving revision 1.28.2.57
diff -u -3 -r1.28.2.56 -r1.28.2.57
--- drbd_fs.c	27 Jan 2004 15:51:36 -0000	1.28.2.56
+++ drbd_fs.c	30 Jan 2004 20:12:34 -0000	1.28.2.57
@@ -351,8 +351,10 @@
 	struct ioctl_get_config cn;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-	//WORK_HERE
-#warning "FIXME make 26 clean, maybe move to compat layer?"
+	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);
 #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_int.h,v
retrieving revision 1.58.2.109
retrieving revision 1.58.2.110
diff -u -3 -r1.58.2.109 -r1.58.2.110
--- drbd_int.h	27 Jan 2004 15:51:36 -0000	1.58.2.109
+++ drbd_int.h	30 Jan 2004 20:12:34 -0000	1.58.2.110
@@ -67,6 +67,7 @@
 
 #undef DEVICE_NAME
 #define DEVICE_NAME "drbd"
+#define DEVFS_NAME "nbd"    // This make sense as long as we are MAJOR 43
 
 // XXX do we need this?
 #ifndef TRUE
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_main.c,v
retrieving revision 1.73.2.116
retrieving revision 1.73.2.117
diff -u -3 -r1.73.2.116 -r1.73.2.117
--- drbd_main.c	30 Jan 2004 19:44:52 -0000	1.73.2.116
+++ drbd_main.c	30 Jan 2004 20:12:34 -0000	1.73.2.117
@@ -1258,7 +1258,7 @@
 #else
 
 #ifdef CONFIG_DEVFS_FS
-	devfs_mk_dir(DEVICE_NAME);
+	devfs_mk_dir(DEVFS_NAME);
 #endif
 
 	for (i = 0; i < minor_count; i++) {
@@ -1282,7 +1282,7 @@
 		disk->first_minor = i;
 		disk->fops = &drbd_ops;
 		sprintf(disk->disk_name, DEVICE_NAME "%d", i);
-		sprintf(disk->devfs_name, DEVICE_NAME "/%d", i);
+		sprintf(disk->devfs_name, DEVFS_NAME "/%d", i);
 		disk->private_data = mdev;
 		add_disk(disk);
 
@@ -1452,7 +1452,7 @@
 # if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 	devfs_unregister(devfs_handle);
 # else
-	devfs_remove(DEVICE_NAME);
+	devfs_remove(DEVFS_NAME);
 # endif
 #endif
 }