Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f80a0ca6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

pktcdvd: improve BKL and compat_ioctl.c usage 



The pktcdvd driver uses proper locking and does not need the BKL in the
ioctl and llseek functions of the character device, so kill both.

Moving the compat_ioctl handling from common code into the driver itself
fixes build problems when CONFIG_BLOCK is disabled.

Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a36fed12

drivers/block/pktcdvd.c

+14 −3
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <linux/module.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/compat.h>

#include <linux/kthread.h>

#include <linux/errno.h>

#include <linux/spinlock.h>
@@ -2984,7 +2985,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd) 
	mutex_unlock(&ctl_mutex);

}



static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)

static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	void __user *argp = (void __user *)arg;

	struct pkt_ctrl_command ctrl_cmd;
@@ -3021,9 +3022,19 @@ static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cm 
	return ret;

}



#ifdef CONFIG_COMPAT

static long pkt_ctl_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	return pkt_ctl_ioctl(file, cmd, (unsigned long)compat_ptr(arg));

}

#endif



static const struct file_operations pkt_ctl_fops = {

	.ioctl	 = pkt_ctl_ioctl,

	.open		= nonseekable_open,

	.unlocked_ioctl	= pkt_ctl_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= pkt_ctl_compat_ioctl,

#endif

	.owner		= THIS_MODULE,

};

fs/compat_ioctl.c

+0 −3
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ 
#include <linux/nbd.h>

#include <linux/random.h>

#include <linux/filter.h>

#include <linux/pktcdvd.h>



#include <linux/hiddev.h>
@@ -1126,8 +1125,6 @@ COMPATIBLE_IOCTL(PPGETMODE) 
COMPATIBLE_IOCTL(PPGETPHASE)

COMPATIBLE_IOCTL(PPGETFLAGS)

COMPATIBLE_IOCTL(PPSETFLAGS)

/* pktcdvd */

COMPATIBLE_IOCTL(PACKET_CTRL_CMD)

/* Big A */

/* sparc only */

/* Big Q for sound/OSS */