[DRBD-cvs] svn commit by phil - r2146 - trunk/drbd - Fix compilation for these 32/64 bit kernels..

drbd-cvs at lists.linbit.com drbd-cvs at lists.linbit.com
Thu Apr 13 18:14:08 CEST 2006


Author: phil
Date: 2006-04-13 18:14:07 +0200 (Thu, 13 Apr 2006)
New Revision: 2146

Modified:
   trunk/drbd/drbd_main.c
Log:
Fix compilation for these 32/64 bit kernels..


Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-04-13 16:01:00 UTC (rev 2145)
+++ trunk/drbd/drbd_main.c	2006-04-13 16:14:07 UTC (rev 2146)
@@ -2201,7 +2201,8 @@
 		drbd_destroy_mempools();
 	}
 
-#if defined(CONFIG_COMPAT)
+#ifndef HAVE_COMPAT_IOCTL_MEMBER
+#if defined(CONFIG_PPC64) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64)
 	lock_kernel();
 	unregister_ioctl32_conversion(DRBD_IOCTL_GET_VERSION);
 	unregister_ioctl32_conversion(DRBD_IOCTL_SET_STATE);
@@ -2218,7 +2219,7 @@
 	unregister_ioctl32_conversion(DRBD_IOCTL_UNCONFIG_DISK);
 	unlock_kernel();
 #endif
-
+#endif
 	kfree(drbd_conf);
 
 	devfs_remove(drbd_devfs_name);
@@ -2399,7 +2400,8 @@
 # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)"
 #endif
 
-#if defined(CONFIG_COMPAT)
+#ifndef HAVE_COMPAT_IOCTL_MEMBER
+#if defined(CONFIG_PPC64) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64)
 	// tell the kernel that we think our ioctls are 64bit clean
 	lock_kernel();
 	register_ioctl32_conversion(DRBD_IOCTL_GET_VERSION,NULL);
@@ -2417,6 +2419,7 @@
 	register_ioctl32_conversion(DRBD_IOCTL_UNCONFIG_DISK,NULL);
 	unlock_kernel();
 #endif
+#endif
 
 	printk(KERN_INFO DEVICE_NAME ": initialised. "
 	       "Version: " REL_VERSION " (api:%d/proto:%d)\n",



More information about the drbd-cvs mailing list