Attachment #245542 for bug #335456





static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp,
                           u_int iocmd, unsigned long ioarg);
#if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
static long LinuxDriver_UnlockedIoctl(struct file *filp,
                           u_int iocmd, unsigned long ioarg);
#endif

static int LinuxDriver_Close(struct inode *inode, struct file *filp);
static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);

   memset(&vmuser_fops, 0, sizeof vmuser_fops);
   vmuser_fops.owner = THIS_MODULE;
   vmuser_fops.poll = LinuxDriverPoll;
#ifdef VMW_HAVE_UNLOCKED_IOCTL
   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
#else
   vmuser_fops.ioctl = LinuxDriver_Ioctl;
#endif
#ifdef HAVE_COMPAT_IOCTL
   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
#endif

}


#if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL)
/*
 *-----------------------------------------------------------------------------
 *

   unlock_kernel();
   return err;
}
#endif


/*




              u_int iocmd,
              unsigned long ioarg)
{
#ifdef HAVE_UNLOCKED_IOCTL
   if (filp->f_op->unlocked_ioctl) {
      return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
   }
#endif
   if (filp->f_op->ioctl) {
      long err;

      lock_kernel();
      err = filp->f_op->ioctl(filp->f_dentry->d_inode, filp, iocmd, ioarg);
      unlock_kernel();

      return err;
   }

   return -ENOIOCTLCMD;
}
#endif //VMON_USE_HIGH_RES_TIMERS

Return to bug 335456

Lines 168-177 Link Here

(-)vmmon-only/linux/driver.c.orig (-8 lines)
168		168
169	static int LinuxDriver_Ioctl(struct inode inode, struct file filp,	169	static int LinuxDriver_Ioctl(struct inode inode, struct file filp,
170	u_int iocmd, unsigned long ioarg);	170	u_int iocmd, unsigned long ioarg);
171	#if defined(HAVE_UNLOCKED_IOCTL) \|\| defined(HAVE_COMPAT_IOCTL)
172	static long LinuxDriver_UnlockedIoctl(struct file *filp,	171	static long LinuxDriver_UnlockedIoctl(struct file *filp,
173	u_int iocmd, unsigned long ioarg);	172	u_int iocmd, unsigned long ioarg);
174	#endif
175		173
176	static int LinuxDriver_Close(struct inode inode, struct file filp);	174	static int LinuxDriver_Close(struct inode inode, struct file filp);
177	static unsigned int LinuxDriverPoll(struct file file, poll_table wait);	175	static unsigned int LinuxDriverPoll(struct file file, poll_table wait);
Lines 420-430 Link Here
420	memset(&vmuser_fops, 0, sizeof vmuser_fops);	418	memset(&vmuser_fops, 0, sizeof vmuser_fops);
421	vmuser_fops.owner = THIS_MODULE;	419	vmuser_fops.owner = THIS_MODULE;
422	vmuser_fops.poll = LinuxDriverPoll;	420	vmuser_fops.poll = LinuxDriverPoll;
423	#ifdef VMW_HAVE_UNLOCKED_IOCTL
424	vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;	421	vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
425	#else
426	vmuser_fops.ioctl = LinuxDriver_Ioctl;
427	#endif
428	#ifdef HAVE_COMPAT_IOCTL	422	#ifdef HAVE_COMPAT_IOCTL
429	vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;	423	vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
430	#endif	424	#endif
Lines 2410-2416 Link Here
2410	}	2404	}
2411		2405
2412		2406
2413	#if defined(HAVE_UNLOCKED_IOCTL) \|\| defined(HAVE_COMPAT_IOCTL)
2414	/*	2407	/*
2415	*-----------------------------------------------------------------------------	2408	*-----------------------------------------------------------------------------
2416	*	2409	*
Lines 2443-2449 Link Here
2443	unlock_kernel();	2436	unlock_kernel();
2444	return err;	2437	return err;
2445	}	2438	}
2446	#endif
2447		2439
2448		2440
2449	/*	2441	/*

Lines 3635-3655 Link Here

(-)vmmon-only/linux/hostif.c.orig (-12 lines)
3635	u_int iocmd,	3635	u_int iocmd,
3636	unsigned long ioarg)	3636	unsigned long ioarg)
3637	{	3637	{
3638	#ifdef HAVE_UNLOCKED_IOCTL
3639	if (filp->f_op->unlocked_ioctl) {	3638	if (filp->f_op->unlocked_ioctl) {
3640	return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);	3639	return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg);
3641	}	3640	}
3642	#endif
3643	if (filp->f_op->ioctl) {
3644	long err;
3645
3646	lock_kernel();
3647	err = filp->f_op->ioctl(filp->f_dentry->d_inode, filp, iocmd, ioarg);
3648	unlock_kernel();
3649
3650	return err;
3651	}
3652
3653	return -ENOIOCTLCMD;	3641	return -ENOIOCTLCMD;
3654	}	3642	}
3655	#endif //VMON_USE_HIGH_RES_TIMERS	3643	#endif //VMON_USE_HIGH_RES_TIMERS