The patch titled
Convert drivers/scsi/ch.c to use unlocked_ioctl
has been added to the -mm tree. Its filename is
convert-drivers-scsi-chc-to-use-unlocked_ioctl.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Convert drivers/scsi/ch.c to use unlocked_ioctl
From: Mathieu Segaud <[EMAIL PROTECTED]>
As of now, compat_ioctl already runs without the BKL, whereas ioctl runs
with the BKL. This patch first converts changer_fops to use a
.unlocked_ioctl member. It applies the same locking rationale than
ch_ioctl_compat() uses to ch_ioctl().
Signed-off-by: Mathieu Segaud <[EMAIL PROTECTED]>
Reviewed-by: Matthew Wilcox <[EMAIL PROTECTED]>
Cc: James Bottomley <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/scsi/ch.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff -puN drivers/scsi/ch.c~convert-drivers-scsi-chc-to-use-unlocked_ioctl
drivers/scsi/ch.c
--- a/drivers/scsi/ch.c~convert-drivers-scsi-chc-to-use-unlocked_ioctl
+++ a/drivers/scsi/ch.c
@@ -92,8 +92,7 @@ static int ch_probe(struct device *);
static int ch_remove(struct device *);
static int ch_open(struct inode * inode, struct file * filp);
static int ch_release(struct inode * inode, struct file * filp);
-static int ch_ioctl(struct inode * inode, struct file * filp,
- unsigned int cmd, unsigned long arg);
+static long ch_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
#ifdef CONFIG_COMPAT
static long ch_ioctl_compat(struct file * filp,
unsigned int cmd, unsigned long arg);
@@ -130,12 +129,12 @@ static struct scsi_driver ch_template =
static const struct file_operations changer_fops =
{
- .owner = THIS_MODULE,
- .open = ch_open,
- .release = ch_release,
- .ioctl = ch_ioctl,
+ .owner = THIS_MODULE,
+ .open = ch_open,
+ .release = ch_release,
+ .unlocked_ioctl = ch_ioctl,
#ifdef CONFIG_COMPAT
- .compat_ioctl = ch_ioctl_compat,
+ .compat_ioctl = ch_ioctl_compat,
#endif
};
@@ -626,7 +625,7 @@ ch_checkrange(scsi_changer *ch, unsigned
return 0;
}
-static int ch_ioctl(struct inode * inode, struct file * file,
+static long ch_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
scsi_changer *ch = file->private_data;
@@ -887,8 +886,7 @@ static long ch_ioctl_compat(struct file
case CHIOINITELEM:
case CHIOSVOLTAG:
/* compatible */
- return ch_ioctl(NULL /* inode, unused */,
- file, cmd, arg);
+ return ch_ioctl(file, cmd, arg);
case CHIOGSTATUS32:
{
struct changer_element_status32 ces32;
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
convert-drivers-scsi-chc-to-use-unlocked_ioctl.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
