[DRBD-cvs] svn commit by lars - r3003 - branches/drbd-8.1/drbd -
unregister_blkdev is void now; add wrapper for older ke
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Fri Jul 27 15:07:26 CEST 2007
Author: lars
Date: 2007-07-27 15:07:19 +0200 (Fri, 27 Jul 2007)
New Revision: 3003
Modified:
branches/drbd-8.1/drbd/drbd_main.c
branches/drbd-8.1/drbd/drbd_wrappers.h
Log:
unregister_blkdev is void now; add wrapper for older kernels.
Modified: branches/drbd-8.1/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.1/drbd/drbd_main.c 2007-07-27 11:35:53 UTC (rev 3002)
+++ branches/drbd-8.1/drbd/drbd_main.c 2007-07-27 13:07:19 UTC (rev 3003)
@@ -2339,8 +2339,7 @@
kfree(minor_table);
- if (unregister_blkdev(DRBD_MAJOR, DEVICE_NAME) != 0)
- printk(KERN_ERR DEVICE_NAME": unregister of device failed\n");
+ drbd_unregister_blkdev(DRBD_MAJOR, DEVICE_NAME);
printk(KERN_INFO DEVICE_NAME": module cleanup done.\n");
}
Modified: branches/drbd-8.1/drbd/drbd_wrappers.h
===================================================================
--- branches/drbd-8.1/drbd/drbd_wrappers.h 2007-07-27 11:35:53 UTC (rev 3002)
+++ branches/drbd-8.1/drbd/drbd_wrappers.h 2007-07-27 13:07:19 UTC (rev 3003)
@@ -185,6 +185,17 @@
);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+static inline void drbd_unregister_blkdev(unsigned int major, const char *name)
+{
+ int ret = unregister_blkdev(major,name);
+ if (ret)
+ printk(KERN_ERR DEVICE_NAME": unregister of device failed\n");
+}
+#else
+#define drbd_unregister_blkdev unregister_blkdev
+#endif
+
#ifdef NEED_BACKPORT_OF_ATOMIC_ADD
#if defined(__x86_64__)
More information about the drbd-cvs
mailing list