asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] st: convert to unlocked_ioctl

Browse source 
Convert st to unlocked_ioctl. The necessary locking was already in place.

Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Kai Makisara 2008-01-17 22:45:22 +02:00 committed by James Bottomley
parent 8ce3eca4dc
commit fd66c1b4e4
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/scsi/st.c
View file

@ -9,7 +9,7 @@
Steve Hirsch, Andreas Koppenh"ofer, Michael Leodolter, Eyal Lebedinsky, Steve Hirsch, Andreas Koppenh"ofer, Michael Leodolter, Eyal Lebedinsky,
Michael Schaefer, J"org Weule, and Eric Youngdale. Michael Schaefer, J"org Weule, and Eric Youngdale.
Copyright 1992 - 2007 Kai Makisara Copyright 1992 - 2008 Kai Makisara
email Kai.Makisara@kolumbus.fi email Kai.Makisara@kolumbus.fi
Some small formal changes - aeb, 950809 Some small formal changes - aeb, 950809
@ -17,7 +17,7 @@
Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
*/ */
static const char *verstr = "20070203"; static const char *verstr = "20080117";
#include <linux/module.h> #include <linux/module.h>
@ -3214,8 +3214,7 @@ static int partition_tape(struct scsi_tape *STp, int size)
/* The ioctl command */ /* The ioctl command */
static int st_ioctl(struct inode *inode, struct file *file, static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg)
unsigned int cmd_in, unsigned long arg)
{ {
int i, cmd_nr, cmd_type, bt; int i, cmd_nr, cmd_type, bt;
int retval = 0; int retval = 0;
@ -3870,7 +3869,7 @@ static const struct file_operations st_fops =
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = st_read, .read = st_read,
.write = st_write, .write = st_write,
.ioctl = st_ioctl, .unlocked_ioctl = st_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = st_compat_ioctl, .compat_ioctl = st_compat_ioctl,
#endif #endif