Commit f1377118 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing 

* 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  uml: Pushdown the bkl from harddog_kern ioctl
  sunrpc: Pushdown the bkl from sunrpc cache ioctl
  sunrpc: Pushdown the bkl from ioctl
  autofs4: Pushdown the bkl from ioctl
  uml: Convert to unlocked_ioctls to remove implicit BKL
  ncpfs: BKL ioctl pushdown
  coda: Clean-up whitespace problems in pioctl.c
  coda: BKL ioctl pushdown
  drivers: Push down BKL into various drivers
  isdn: Push down BKL into ioctl functions
  scsi: Push down BKL into ioctl functions
  dvb: Push down BKL into ioctl functions
  smbfs: Push down BKL into ioctl function
  coda/psdev: Remove BKL from ioctl function
  um/mmapper: Remove BKL usage
  sn_hwperf: Kill BKL usage
  hfsplus: Push down BKL into ioctl function
parents 15953654 9f37af65

arch/ia64/sn/kernel/sn2/sn_hwperf.c

+2 −7
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/miscdevice.h>

#include <linux/utsname.h>

#include <linux/cpumask.h>

#include <linux/smp_lock.h>

#include <linux/nodemask.h>

#include <linux/smp.h>

#include <linux/mutex.h>
@@ -682,8 +681,7 @@ static int sn_hwperf_map_err(int hwperf_err) 
/*

 * ioctl for "sn_hwperf" misc device

 */

static int

sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)

static long sn_hwperf_ioctl(struct file *fp, u32 op, unsigned long arg)

{

	struct sn_hwperf_ioctl_args a;

	struct cpuinfo_ia64 *cdata;
@@ -699,8 +697,6 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg) 
	int i;

	int j;



	unlock_kernel();



	/* only user requests are allowed here */

	if ((op & SN_HWPERF_OP_MASK) < 10) {

		r = -EINVAL;
@@ -859,12 +855,11 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg) 
error:

	vfree(p);



	lock_kernel();

	return r;

}



static const struct file_operations sn_hwperf_fops = {

	.ioctl = sn_hwperf_ioctl,

	.unlocked_ioctl = sn_hwperf_ioctl,

};



static struct miscdevice sn_hwperf_dev = {

arch/um/drivers/harddog_kern.c

+15 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static ssize_t harddog_write(struct file *file, const char __user *data, size_t 
	return 0;

}



static int harddog_ioctl(struct inode *inode, struct file *file,

static int harddog_ioctl_unlocked(struct file *file,

				  unsigned int cmd, unsigned long arg)

{

	void __user *argp= (void __user *)arg;
@@ -148,10 +148,22 @@ static int harddog_ioctl(struct inode *inode, struct file *file, 
	}

}



static long harddog_ioctl(struct file *file,

			  unsigned int cmd, unsigned long arg)

{

	long ret;



	lock_kernel();

	ret = harddog_ioctl_unlocked(file, cmd, arg);

	unlock_kernel();



	return ret;

}



static const struct file_operations harddog_fops = {

	.owner		= THIS_MODULE,

	.write		= harddog_write,

	.ioctl		= harddog_ioctl,

	.unlocked_ioctl	= harddog_ioctl,

	.open		= harddog_open,

	.release	= harddog_release,

};

arch/um/drivers/hostaudio_kern.c

+4 −4
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static unsigned int hostaudio_poll(struct file *file, 
	return mask;

}



static int hostaudio_ioctl(struct inode *inode, struct file *file,

static long hostaudio_ioctl(struct file *file,

			   unsigned int cmd, unsigned long arg)

{

	struct hostaudio_state *state = file->private_data;
@@ -223,7 +223,7 @@ static int hostaudio_release(struct inode *inode, struct file *file) 


/* /dev/mixer file operations */



static int hostmixer_ioctl_mixdev(struct inode *inode, struct file *file,

static long hostmixer_ioctl_mixdev(struct file *file,

				  unsigned int cmd, unsigned long arg)

{

	struct hostmixer_state *state = file->private_data;
@@ -289,7 +289,7 @@ static const struct file_operations hostaudio_fops = { 
	.read           = hostaudio_read,

	.write          = hostaudio_write,

	.poll           = hostaudio_poll,

	.ioctl          = hostaudio_ioctl,

	.unlocked_ioctl	= hostaudio_ioctl,

	.mmap           = NULL,

	.open           = hostaudio_open,

	.release        = hostaudio_release,
@@ -298,7 +298,7 @@ static const struct file_operations hostaudio_fops = { 
static const struct file_operations hostmixer_fops = {

	.owner          = THIS_MODULE,

	.llseek         = no_llseek,

	.ioctl          = hostmixer_ioctl_mixdev,

	.unlocked_ioctl	= hostmixer_ioctl_mixdev,

	.open           = hostmixer_open_mixdev,

	.release        = hostmixer_release,

};

arch/um/drivers/mmapper_kern.c

+2 −3
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ static ssize_t mmapper_write(struct file *file, const char __user *buf, 
	return count;

}



static int mmapper_ioctl(struct inode *inode, struct file *file,

			 unsigned int cmd, unsigned long arg)

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

{

	return -ENOIOCTLCMD;

}
@@ -90,7 +89,7 @@ static const struct file_operations mmapper_fops = { 
	.owner		= THIS_MODULE,

	.read		= mmapper_read,

	.write		= mmapper_write,

	.ioctl		= mmapper_ioctl,

	.unlocked_ioctl	= mmapper_ioctl,

	.mmap		= mmapper_mmap,

	.open		= mmapper_open,

	.release	= mmapper_release,

drivers/char/apm-emulation.c

+5 −3
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ static unsigned int apm_poll(struct file *fp, poll_table * wait) 
 *   Only when everyone who has opened /dev/apm_bios with write permission

 *   has acknowledge does the actual suspend happen.

 */

static int

apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)

static long

apm_ioctl(struct file *filp, u_int cmd, u_long arg)

{

	struct apm_user *as = filp->private_data;

	int err = -EINVAL;
@@ -274,6 +274,7 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) 
	if (!as->suser || !as->writer)

		return -EPERM;



	lock_kernel();

	switch (cmd) {

	case APM_IOC_SUSPEND:

		mutex_lock(&state_lock);
@@ -334,6 +335,7 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) 
		mutex_unlock(&state_lock);

		break;

	}

	unlock_kernel();



	return err;

}
@@ -397,7 +399,7 @@ static const struct file_operations apm_bios_fops = { 
	.owner		= THIS_MODULE,

	.read		= apm_read,

	.poll		= apm_poll,

	.ioctl		= apm_ioctl,

	.unlocked_ioctl	= apm_ioctl,

	.open		= apm_open,

	.release	= apm_release,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE