Commit 3aea50a3 authored by Alan Cox's avatar Alan Cox Committed by Stefan Richter
Browse files

ieee1394: raw1394: Push the BKL down into the driver ioctls 



Actually in this case wrap the function for now.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>

Added raw1394_compat_ioctl hunk.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 055a7da0

drivers/ieee1394/raw1394.c

+15 −5
Original line number Diff line number Diff line
@@ -2549,8 +2549,8 @@ static int raw1394_mmap(struct file *file, struct vm_area_struct *vma) 
}



/* ioctl is only used for rawiso operations */

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

			 unsigned int cmd, unsigned long arg)

static long do_raw1394_ioctl(struct file *file, unsigned int cmd,

							unsigned long arg)

{

	struct file_info *fi = file->private_data;

	void __user *argp = (void __user *)arg;
@@ -2656,6 +2656,16 @@ static int raw1394_ioctl(struct inode *inode, struct file *file, 
	return -EINVAL;

}



static long raw1394_ioctl(struct file *file, unsigned int cmd,

							unsigned long arg)

{

	long ret;

	lock_kernel();

	ret = do_raw1394_ioctl(file, cmd, arg);

	unlock_kernel();

	return ret;

}



#ifdef CONFIG_COMPAT

struct raw1394_iso_packets32 {

        __u32 n_packets;
@@ -2690,7 +2700,7 @@ static long raw1394_iso_xmit_recv_packets32(struct file *file, unsigned int cmd, 
	    !copy_from_user(&infos32, &arg->infos, sizeof infos32)) {

		infos = compat_ptr(infos32);

		if (!copy_to_user(&dst->infos, &infos, sizeof infos))

			err = raw1394_ioctl(NULL, file, cmd, (unsigned long)dst);

			err = do_raw1394_ioctl(file, cmd, (unsigned long)dst);

	}

	return err;

}
@@ -2731,7 +2741,7 @@ static long raw1394_compat_ioctl(struct file *file, 
	case RAW1394_IOC_ISO_GET_STATUS:

	case RAW1394_IOC_ISO_SHUTDOWN:

	case RAW1394_IOC_ISO_QUEUE_ACTIVITY:

		err = raw1394_ioctl(NULL, file, cmd, arg);

		err = do_raw1394_ioctl(file, cmd, arg);

		break;

	/* These request have different format. */

	case RAW1394_IOC_ISO_RECV_PACKETS32:
@@ -2984,7 +2994,7 @@ static const struct file_operations raw1394_fops = { 
	.read = raw1394_read,

	.write = raw1394_write,

	.mmap = raw1394_mmap,

	.ioctl = raw1394_ioctl,

	.unlocked_ioctl = raw1394_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = raw1394_compat_ioctl,

#endif