Hi Ryusuke,
On Tue, 2009-02-17 at 16:42 +0900, Ryusuke Konishi wrote:
> Pekka Enberg suggested converting ->ioctl operations to use
> ->unlocked_ioctl to avoid BKL.
>
> The conversion was verified to be safe, so I will take it on this
> occasion.
>
> Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
> ---
> fs/nilfs2/dir.c | 2 +-
> fs/nilfs2/file.c | 2 +-
> fs/nilfs2/ioctl.c | 4 ++--
> fs/nilfs2/nilfs.h | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
> index 393316c..54100ac 100644
> --- a/fs/nilfs2/dir.c
> +++ b/fs/nilfs2/dir.c
> @@ -702,7 +702,7 @@ struct file_operations nilfs_dir_operations = {
> .llseek = generic_file_llseek,
> .read = generic_read_dir,
> .readdir = nilfs_readdir,
> - .ioctl = nilfs_ioctl,
> + .unlocked_ioctl = nilfs_ioctl,
> #ifdef CONFIG_COMPAT
> .compat_ioctl = nilfs_ioctl,
> #endif /* CONFIG_COMPAT */
> diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
> index 1670038..df74577 100644
> --- a/fs/nilfs2/file.c
> +++ b/fs/nilfs2/file.c
> @@ -138,7 +138,7 @@ struct file_operations nilfs_file_operations = {
> .write = do_sync_write,
> .aio_read = generic_file_aio_read,
> .aio_write = generic_file_aio_write,
> - .ioctl = nilfs_ioctl,
> + .unlocked_ioctl = nilfs_ioctl,
> #ifdef CONFIG_COMPAT
> .compat_ioctl = nilfs_ioctl,
> #endif /* CONFIG_COMPAT */
> diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
> index 33aff88..cfb2789 100644
> --- a/fs/nilfs2/ioctl.c
> +++ b/fs/nilfs2/ioctl.c
> @@ -600,9 +600,9 @@ static int nilfs_ioctl_sync(struct inode *inode, struct file *filp,
> return 0;
> }
>
> -int nilfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
> - unsigned long arg)
> +long nilfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
> {
> + struct inode *inode = filp->f_dentry->d_inode;
> void __user *argp = (void * __user *)arg;
>
> switch (cmd) {
> diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h
> index ad17fa9..f865ecb 100644
> --- a/fs/nilfs2/nilfs.h
> +++ b/fs/nilfs2/nilfs.h
> @@ -242,7 +242,7 @@ extern void nilfs_set_link(struct inode *, struct nilfs_dir_entry *,
> extern int nilfs_sync_file(struct file *, struct dentry *, int);
>
> /* ioctl.c */
> -int nilfs_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
> +long nilfs_ioctl(struct file *, unsigned int, unsigned long);
> int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, void __user *);
>
> /* inode.c */
Maybe I'm looking at an old version of nilfs but don't you need to
remove nilfs_compat_locked_ioctl() and the lock_kernel()/unlock_kernel()
from nilfs_ioctl_timedwait() as well?
Pekka
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
