X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fnilfs2%2Ffile.c;h=6bd84a0d82385cf26e6bc8194dfe5340d73d149a;hb=7a9461939a46345860622ea36ff267ee4446f00f;hp=a2bd962ebd859d7dfa59b4ce8fae33ce31390609;hpb=8082d36aed26c4fb6ed43e4008303682eabf839e;p=linux-2.6-omap-h63xx.git

diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
index a2bd962ebd8..6bd84a0d823 100644
--- a/fs/nilfs2/file.c
+++ b/fs/nilfs2/file.c
@@ -140,7 +140,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 */