nilfs2: use unlocked_ioctl

[linux-2.6-omap-h63xx.git] / fs / nilfs2 / file.c

diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
index cd38124372f3c0b396c18e91c7822d87c71348ac..6bd84a0d82385cf26e6bc8194dfe5340d73d149a 100644 (file)
--- a/fs/nilfs2/file.c
+++ b/fs/nilfs2/file.c
@@ -140,9 +140,9 @@ 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_compat_ioctl,
+       .compat_ioctl   = nilfs_ioctl,
 #endif /* CONFIG_COMPAT */
        .mmap           = nilfs_file_mmap,
        .open           = generic_file_open,