[DRBD-cvs] svn commit by phil - r2020 - branches/drbd-0.7/drbd - This should fix the last two issues on AMD64

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2005-12-19 17:08:17 +0100 (Mon, 19 Dec 2005)
New Revision: 2020

Modified:
   branches/drbd-0.7/drbd/drbd_fs.c
   branches/drbd-0.7/drbd/drbd_main.c
Log:
This should fix the last two issues on AMD64


Modified: branches/drbd-0.7/drbd/drbd_fs.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_fs.c	2005-12-19 15:43:32 UTC (rev 2019)
+++ branches/drbd-0.7/drbd/drbd_fs.c	2005-12-19 16:08:17 UTC (rev 2020)
@@ -1025,9 +1025,9 @@
 long drbd_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg)
 {
 	int ret;
-	lock_kernel();
+	// lock_kernel(); Not needed, since we have mdev->device_mutex
 	ret = drbd_ioctl(f->f_dentry->d_inode, f, cmd, arg);
-	unlock_kernel();
+	// unlock_kernel();
 	return ret;
 }
 #endif

Modified: branches/drbd-0.7/drbd/drbd_main.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_main.c	2005-12-19 15:43:32 UTC (rev 2019)
+++ branches/drbd-0.7/drbd/drbd_main.c	2005-12-19 16:08:17 UTC (rev 2020)
@@ -78,7 +78,7 @@
 # ifdef CONFIG_COMPAT
 #  if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)
     /* FIXME on which thing could we test instead of the KERNEL_VERSION
-     * again?  register_ioctl32_conversion was deprecated in 2.610, got
+     * again?  register_ioctl32_conversion was deprecated in 2.6.10, got
      * "officially" deprecated somewhen in 2.6.12, and removed in 2.6.14.
      * so lets assume all vendor kernels did the transition.  */
 #    define HAVE_COMPAT_IOCTL_MEMBER
@@ -172,7 +172,7 @@
 	.open =    drbd_open,
 	.release = drbd_close,
 	.ioctl =   drbd_ioctl,
-#ifdef CONFIG_COMPAT
+#ifdef HAVE_COMPAT_IOCTL_MEMBER
 	.compat_ioctl = drbd_compat_ioctl,
 #endif
 };