lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ncpfs: BKL ioctl pushdown

Browse Source 
Convert ncp_ioctl to an unlocked_ioctl and push 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: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
This commit is contained in:
John Kacur
2010-05-05 15:15:37 +02:00
committed by Frederic Weisbecker
parent 1977bb2ed8
commit 93d84b6d99
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ncpfs/dir.c
View File

@@ -51,7 +51,7 @@ const struct file_operations ncp_dir_operations =
{ {
.read = generic_read_dir, .read = generic_read_dir,
.readdir = ncp_readdir, .readdir = ncp_readdir,
.ioctl = ncp_ioctl, .unlocked_ioctl = ncp_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = ncp_compat_ioctl, .compat_ioctl = ncp_compat_ioctl,
#endif #endif

2
fs/ncpfs/file.c
View File

@@ -295,7 +295,7 @@ const struct file_operations ncp_file_operations =
.llseek = ncp_remote_llseek, .llseek = ncp_remote_llseek,
.read = ncp_file_read, .read = ncp_file_read,
.write = ncp_file_write, .write = ncp_file_write,
.ioctl = ncp_ioctl, .unlocked_ioctl = ncp_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.compat_ioctl = ncp_compat_ioctl, .compat_ioctl = ncp_compat_ioctl,
#endif #endif

27
fs/ncpfs/ioctl.c
View File

@@ -20,6 +20,7 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/smp_lock.h>
#include <linux/ncp_fs.h> #include <linux/ncp_fs.h>
@@ -261,9 +262,9 @@ ncp_get_charsets(struct ncp_server* server, struct ncp_nls_ioctl __user *arg)
} }
#endif /* CONFIG_NCPFS_NLS */ #endif /* CONFIG_NCPFS_NLS */
static int __ncp_ioctl(struct inode *inode, struct file *filp, static long __ncp_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
struct inode *inode = filp->f_dentry->d_inode;
struct ncp_server *server = NCP_SERVER(inode); struct ncp_server *server = NCP_SERVER(inode);
int result; int result;
struct ncp_ioctl_request request; struct ncp_ioctl_request request;
@@ -841,11 +842,11 @@ static int ncp_ioctl_need_write(unsigned int cmd)
} }
} }
int ncp_ioctl(struct inode *inode, struct file *filp, long ncp_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
int ret; long ret;
lock_kernel();
if (ncp_ioctl_need_write(cmd)) { if (ncp_ioctl_need_write(cmd)) {
/* /*
* inside the ioctl(), any failures which * inside the ioctl(), any failures which
@@ -853,24 +854,28 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
* -EACCESS, so it seems consistent to keep * -EACCESS, so it seems consistent to keep
* that here. * that here.
*/ */
if (mnt_want_write(filp->f_path.mnt)) if (mnt_want_write(filp->f_path.mnt)) {
return -EACCES; ret = -EACCES;
goto out;
}
} }
ret = __ncp_ioctl(inode, filp, cmd, arg); ret = __ncp_ioctl(filp, cmd, arg);
if (ncp_ioctl_need_write(cmd)) if (ncp_ioctl_need_write(cmd))
mnt_drop_write(filp->f_path.mnt); mnt_drop_write(filp->f_path.mnt);
out:
unlock_kernel();
return ret; return ret;
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
long ncp_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) long ncp_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
struct inode *inode = file->f_path.dentry->d_inode; long ret;
int ret;
lock_kernel(); lock_kernel();
arg = (unsigned long) compat_ptr(arg); arg = (unsigned long) compat_ptr(arg);
ret = ncp_ioctl(inode, file, cmd, arg); ret = ncp_ioctl(file, cmd, arg);
unlock_kernel(); unlock_kernel();
return ret; return ret;
} }

2
include/linux/ncp_fs.h
View File

@@ -210,7 +210,7 @@ int ncp_date_dos2unix(__le16 time, __le16 date);
void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date); void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date);
/* linux/fs/ncpfs/ioctl.c */ /* linux/fs/ncpfs/ioctl.c */
int ncp_ioctl(struct inode *, struct file *, unsigned int, unsigned long); long ncp_ioctl(struct file *, unsigned int, unsigned long);
long ncp_compat_ioctl(struct file *, unsigned int, unsigned long); long ncp_compat_ioctl(struct file *, unsigned int, unsigned long);
/* linux/fs/ncpfs/sock.c */ /* linux/fs/ncpfs/sock.c */