leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coda: BKL ioctl pushdown

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

Signed-off-by: John 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: Frederic Weisbecker <fweisbec@gmail.com>
This commit is contained in:
John Kacur 2010-05-05 15:15:34 +02:00 committed by Frederic Weisbecker
parent 55929332c9
commit 2ff82f8521
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fs/coda/pioctl.c
View File

@ -23,10 +23,12 @@
#include <linux/coda_fs_i.h> #include <linux/coda_fs_i.h>
#include <linux/coda_psdev.h> #include <linux/coda_psdev.h>
#include <linux/smp_lock.h>
/* pioctl ops */ /* pioctl ops */
static int coda_ioctl_permission(struct inode *inode, int mask); static int coda_ioctl_permission(struct inode *inode, int mask);
static int coda_pioctl(struct inode * inode, struct file * filp, static long coda_pioctl(struct file *filp, unsigned int cmd,
unsigned int cmd, unsigned long user_data); unsigned long user_data);
/* exported from this file */ /* exported from this file */
const struct inode_operations coda_ioctl_inode_operations = 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 = { const struct file_operations coda_ioctl_operations = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ioctl = coda_pioctl, .unlocked_ioctl = coda_pioctl,
}; };
/* the coda pioctl inode ops */ /* 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; return (mask & MAY_EXEC) ? -EACCES : 0;
} }
static int coda_pioctl(struct inode * inode, struct file * filp, static long coda_pioctl(struct file *filp, unsigned int cmd,
unsigned int cmd, unsigned long user_data) unsigned long user_data)
{ {
struct path path; struct path path;
int error; int error;
struct PioctlData data; struct PioctlData data;
struct inode *inode = filp->f_dentry->d_inode;
struct inode *target_inode = NULL; struct inode *target_inode = NULL;
struct coda_inode_info *cnp; struct coda_inode_info *cnp;
lock_kernel();
/* get the Pioctl data arguments from user space */ /* get the Pioctl data arguments from user space */
if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) { 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 * Look up the pathname. Note that the pathname is in
* user memory, and namei takes care of this * user memory, and namei takes care of this
*/ */
if (data.follow) { if (data.follow)
error = user_path(data.path, &path); error = user_path(data.path, &path);
} else { else
error = user_lpath(data.path, &path); error = user_lpath(data.path, &path);
}
if (error)
if ( error ) { goto out;
return error; else
} else {
target_inode = path.dentry->d_inode; target_inode = path.dentry->d_inode;
}
/* return if it is not a Coda inode */ /* return if it is not a Coda inode */
if ( target_inode->i_sb != inode->i_sb ) { if ( target_inode->i_sb != inode->i_sb ) {
path_put(&path); path_put(&path);
return -EINVAL; error = -EINVAL;
goto out;
} }
/* now proceed to make the upcall */ /* 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); error = venus_pioctl(inode->i_sb, &(cnp->c_fid), cmd, &data);
path_put(&path); path_put(&path);
out:
unlock_kernel();
return error; return error;
} }