From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757421AbYAQUpr (ORCPT ); Thu, 17 Jan 2008 15:45:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753097AbYAQUpi (ORCPT ); Thu, 17 Jan 2008 15:45:38 -0500 Received: from emh01.mail.saunalahti.fi ([62.142.5.107]:47238 "EHLO emh01.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751761AbYAQUph (ORCPT ); Thu, 17 Jan 2008 15:45:37 -0500 Date: Thu, 17 Jan 2008 22:45:22 +0200 (EET) From: Kai Makisara X-X-Sender: makisara@kai.makisara.local To: linux-scsi@vger.kernel.org cc: linux-kernel@vger.kernel.org Subject: [PATCH] SCSI st : convert to unlocked_ioctl Message-ID: User-Agent: Alpine 1.00 (LSU 882 2007-12-20) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Antivirus: VAMS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert st to unlocked_ioctl. The necessary locking was already in place. Signed-off-by: Kai Makisara --- The patch is against 2.6.24-rc8. drivers/scsi/st.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- linux-2.6/drivers/scsi/st.c 2007-12-20 18:26:03.000000000 +0200 +++ linux-2.6-rc8-test/drivers/scsi/st.c 2008-01-17 21:49:14.000000000 +0200 @@ -9,7 +9,7 @@ Steve Hirsch, Andreas Koppenh"ofer, Michael Leodolter, Eyal Lebedinsky, Michael Schaefer, J"org Weule, and Eric Youngdale. - Copyright 1992 - 2007 Kai Makisara + Copyright 1992 - 2008 Kai Makisara email Kai.Makisara@kolumbus.fi Some small formal changes - aeb, 950809 @@ -17,7 +17,7 @@ Last modified: 18-JAN-1998 Richard Gooch Devfs support */ -static const char *verstr = "20070203"; +static const char *verstr = "20080117"; #include @@ -3214,8 +3214,7 @@ static int partition_tape(struct scsi_ta /* The ioctl command */ -static int st_ioctl(struct inode *inode, struct file *file, - unsigned int cmd_in, unsigned long arg) +static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg) { int i, cmd_nr, cmd_type, bt; int retval = 0; @@ -3870,7 +3869,7 @@ static const struct file_operations st_f .owner = THIS_MODULE, .read = st_read, .write = st_write, - .ioctl = st_ioctl, + .unlocked_ioctl = st_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = st_compat_ioctl, #endif