diff options
author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2009-04-07 04:01:53 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:31:19 +0200 |
commit | 7a9461939a46345860622ea36ff267ee4446f00f (patch) | |
tree | 5607ba81b9580e2979bcfb806d5b04f5fbfd53d9 /fs/nilfs2/ioctl.c | |
parent | nilfs2: remove compat ioctl code (diff) | |
download | linux-7a9461939a46345860622ea36ff267ee4446f00f.tar.xz linux-7a9461939a46345860622ea36ff267ee4446f00f.zip |
nilfs2: use unlocked_ioctl
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@cs.helsinki.fi>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nilfs2/ioctl.c')
-rw-r--r-- | fs/nilfs2/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 33aff8842ce9..cfb27892ffe8 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) { |