Re: [PATCH 5/6] smbfs: BKL ioctl pushdown

From: Frederic Weisbecker
Date: Sun May 16 2010 - 22:26:38 EST


On Wed, May 05, 2010 at 03:15:38PM +0200, John Kacur wrote:
> Convert smb_ioctl to an unlocked ioctl and push down the bkl into it.
>
> Signed-off-by: John Kacur <jkacur@xxxxxxxxxx>


Applied, thanks.



> ---
> fs/smbfs/dir.c | 2 +-
> fs/smbfs/file.c | 2 +-
> fs/smbfs/ioctl.c | 10 +++++++---
> fs/smbfs/proto.h | 2 +-
> 4 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
> index 3e4803b..6c97842 100644
> --- a/fs/smbfs/dir.c
> +++ b/fs/smbfs/dir.c
> @@ -39,7 +39,7 @@ const struct file_operations smb_dir_operations =
> {
> .read = generic_read_dir,
> .readdir = smb_readdir,
> - .ioctl = smb_ioctl,
> + .unlocked_ioctl = smb_ioctl,
> .open = smb_dir_open,
> };
>
> diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
> index dbf6548..84ecf0e 100644
> --- a/fs/smbfs/file.c
> +++ b/fs/smbfs/file.c
> @@ -437,7 +437,7 @@ const struct file_operations smb_file_operations =
> .aio_read = smb_file_aio_read,
> .write = do_sync_write,
> .aio_write = smb_file_aio_write,
> - .ioctl = smb_ioctl,
> + .unlocked_ioctl = smb_ioctl,
> .mmap = smb_file_mmap,
> .open = smb_file_open,
> .release = smb_file_release,
> diff --git a/fs/smbfs/ioctl.c b/fs/smbfs/ioctl.c
> index dbae1f8..dfc3a94 100644
> --- a/fs/smbfs/ioctl.c
> +++ b/fs/smbfs/ioctl.c
> @@ -19,17 +19,19 @@
> #include <linux/smb_mount.h>
>
> #include <asm/uaccess.h>
> +#include <linux/smp_lock.h>
>
> #include "proto.h"
>
> -int
> -smb_ioctl(struct inode *inode, struct file *filp,
> - unsigned int cmd, unsigned long arg)
> +long smb_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
> {
> + struct inode *inode = filp->f_dentry->d_inode;
> struct smb_sb_info *server = server_from_inode(inode);
> struct smb_conn_opt opt;
> int result = -EINVAL;
>
> + lock_kernel();
> +
> switch (cmd) {
> uid16_t uid16;
> uid_t uid32;
> @@ -63,5 +65,7 @@ smb_ioctl(struct inode *inode, struct file *filp,
> break;
> }
>
> + unlock_kernel();
> +
> return result;
> }
> diff --git a/fs/smbfs/proto.h b/fs/smbfs/proto.h
> index 03f456c..05939a6 100644
> --- a/fs/smbfs/proto.h
> +++ b/fs/smbfs/proto.h
> @@ -67,7 +67,7 @@ extern const struct address_space_operations smb_file_aops;
> extern const struct file_operations smb_file_operations;
> extern const struct inode_operations smb_file_inode_operations;
> /* ioctl.c */
> -extern int smb_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg);
> +extern long smb_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
> /* smbiod.c */
> extern void smbiod_wake_up(void);
> extern int smbiod_register_server(struct smb_sb_info *server);
> --
> 1.6.6.1
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/