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

sunrpc: remove the big kernel lock

Browse Source 
The sunrpc cache_ioctl function does not need the big kernel lock
because it uses its own queue_lock already.

rpc_pipe_ioctl apparently should be using i_lock like the other
operations on the pipe file descriptor do.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2010-10-04 21:18:23 +02:00
parent 1fa4f3b57c
commit a6f8dbc654
2 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/sunrpc/cache.c
View File

@ -28,7 +28,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/smp_lock.h>
#include <asm/ioctls.h> #include <asm/ioctls.h>
#include <linux/sunrpc/types.h> #include <linux/sunrpc/types.h>
#include <linux/sunrpc/cache.h> #include <linux/sunrpc/cache.h>
@ -1348,15 +1347,10 @@ static unsigned int cache_poll_procfs(struct file *filp, poll_table *wait)
static long cache_ioctl_procfs(struct file *filp, static long cache_ioctl_procfs(struct file *filp,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
long ret;
struct inode *inode = filp->f_path.dentry->d_inode; struct inode *inode = filp->f_path.dentry->d_inode;
struct cache_detail *cd = PDE(inode)->data; struct cache_detail *cd = PDE(inode)->data;
lock_kernel(); return cache_ioctl(inode, filp, cmd, arg, cd);
ret = cache_ioctl(inode, filp, cmd, arg, cd);
unlock_kernel();
return ret;
} }
static int cache_open_procfs(struct inode *inode, struct file *filp) static int cache_open_procfs(struct inode *inode, struct file *filp)
@ -1555,13 +1549,8 @@ static long cache_ioctl_pipefs(struct file *filp,
{ {
struct inode *inode = filp->f_dentry->d_inode; struct inode *inode = filp->f_dentry->d_inode;
struct cache_detail *cd = RPC_I(inode)->private; struct cache_detail *cd = RPC_I(inode)->private;
long ret;
lock_kernel(); return cache_ioctl(inode, filp, cmd, arg, cd);
ret = cache_ioctl(inode, filp, cmd, arg, cd);
unlock_kernel();
return ret;
} }
static int cache_open_pipefs(struct inode *inode, struct file *filp) static int cache_open_pipefs(struct inode *inode, struct file *filp)

26
net/sunrpc/rpc_pipe.c
View File

@ -27,7 +27,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/sunrpc/rpc_pipe_fs.h> #include <linux/sunrpc/rpc_pipe_fs.h>
#include <linux/sunrpc/cache.h> #include <linux/sunrpc/cache.h>
#include <linux/smp_lock.h>
static struct vfsmount *rpc_mount __read_mostly; static struct vfsmount *rpc_mount __read_mostly;
static int rpc_mount_count; static int rpc_mount_count;
@ -309,40 +308,33 @@ rpc_pipe_poll(struct file *filp, struct poll_table_struct *wait)
return mask; return mask;
} }
static int static long
rpc_pipe_ioctl_unlocked(struct file *filp, unsigned int cmd, unsigned long arg) rpc_pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{ {
struct rpc_inode *rpci = RPC_I(filp->f_path.dentry->d_inode); struct inode *inode = filp->f_path.dentry->d_inode;
struct rpc_inode *rpci = RPC_I(inode);
int len; int len;
switch (cmd) { switch (cmd) {
case FIONREAD: case FIONREAD:
if (rpci->ops == NULL) spin_lock(&inode->i_lock);
if (rpci->ops == NULL) {
spin_unlock(&inode->i_lock);
return -EPIPE; return -EPIPE;
}
len = rpci->pipelen; len = rpci->pipelen;
if (filp->private_data) { if (filp->private_data) {
struct rpc_pipe_msg *msg; struct rpc_pipe_msg *msg;
msg = (struct rpc_pipe_msg *)filp->private_data; msg = (struct rpc_pipe_msg *)filp->private_data;
len += msg->len - msg->copied; len += msg->len - msg->copied;
} }
spin_unlock(&inode->i_lock);
return put_user(len, (int __user *)arg); return put_user(len, (int __user *)arg);
default: default:
return -EINVAL; return -EINVAL;
} }
} }
static long
rpc_pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
long ret;
lock_kernel();
ret = rpc_pipe_ioctl_unlocked(filp, cmd, arg);
unlock_kernel();
return ret;
}
static const struct file_operations rpc_pipe_fops = { static const struct file_operations rpc_pipe_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,