Commit 2ff82f85 authored by John Kacur's avatar John Kacur Committed by Frederic Weisbecker
Browse files

coda: BKL ioctl pushdown



Convert coda_pioctl to an unlocked_ioctl pushing down the BKL
into it.

Signed-off-by: default avatarJohn Kacur <jkacur@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent 55929332
Loading
Loading
Loading
Loading
+24 −17
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@
#include <linux/coda_fs_i.h>
#include <linux/coda_psdev.h>

#include <linux/smp_lock.h>

/* pioctl ops */
static int coda_ioctl_permission(struct inode *inode, int mask);
static int coda_pioctl(struct inode * inode, struct file * filp, 
                       unsigned int cmd, unsigned long user_data);
static long coda_pioctl(struct file *filp, unsigned int cmd,
			unsigned long user_data);

/* exported from this file */
const struct inode_operations coda_ioctl_inode_operations =
@@ -37,7 +39,7 @@ const struct inode_operations coda_ioctl_inode_operations =

const struct file_operations coda_ioctl_operations = {
	.owner		= THIS_MODULE,
	.ioctl		= coda_pioctl,
	.unlocked_ioctl	= coda_pioctl,
};

/* the coda pioctl inode ops */
@@ -46,40 +48,43 @@ static int coda_ioctl_permission(struct inode *inode, int mask)
	return (mask & MAY_EXEC) ? -EACCES : 0;
}

static int coda_pioctl(struct inode * inode, struct file * filp, 
                       unsigned int cmd, unsigned long user_data)
static long coda_pioctl(struct file *filp, unsigned int cmd,
			unsigned long user_data)
{
	struct path path;
        int error;
	struct PioctlData data;
	struct inode *inode = filp->f_dentry->d_inode;
        struct inode *target_inode = NULL;
        struct coda_inode_info *cnp;

	lock_kernel();

        /* get the Pioctl data arguments from user space */
        if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) {
	    return -EINVAL;
		error = -EINVAL;
		goto out;
	}
       
        /* 
         * Look up the pathname. Note that the pathname is in 
         * user memory, and namei takes care of this
         */
        if (data.follow) {
	if (data.follow)
                error = user_path(data.path, &path);
	} else {
	else
	        error = user_lpath(data.path, &path);
	}

	if ( error ) {
		return error;
        } else {
	if (error)
		goto out;
	else
		target_inode = path.dentry->d_inode;
	}

	/* return if it is not a Coda inode */
	if ( target_inode->i_sb != inode->i_sb ) {
		path_put(&path);
	        return  -EINVAL;
		error = -EINVAL;
		goto out;
	}

	/* now proceed to make the upcall */
@@ -88,6 +93,8 @@ static int coda_pioctl(struct inode * inode, struct file * filp,
	error = venus_pioctl(inode->i_sb, &(cnp->c_fid), cmd, &data);

	path_put(&path);

out:
	unlock_kernel();
        return error;
}