diff options
author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2009-04-06 22:01:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:19 -0400 |
commit | 7a9461939a46345860622ea36ff267ee4446f00f (patch) | |
tree | 5607ba81b9580e2979bcfb806d5b04f5fbfd53d9 /fs/nilfs2/nilfs.h | |
parent | 8082d36aed26c4fb6ed43e4008303682eabf839e (diff) |
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/nilfs.h')
-rw-r--r-- | fs/nilfs2/nilfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h index f767644a7242..d08fb1ce5012 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 *, | |||
242 | extern int nilfs_sync_file(struct file *, struct dentry *, int); | 242 | extern int nilfs_sync_file(struct file *, struct dentry *, int); |
243 | 243 | ||
244 | /* ioctl.c */ | 244 | /* ioctl.c */ |
245 | int nilfs_ioctl(struct inode *, struct file *, unsigned int, unsigned long); | 245 | long nilfs_ioctl(struct file *, unsigned int, unsigned long); |
246 | int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, void __user *); | 246 | int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *, void __user *); |
247 | 247 | ||
248 | /* inode.c */ | 248 | /* inode.c */ |