X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fjffs2%2Ffile.c;h=5a98aa87c8530b169ec0453f977860550df73f38;hb=d26acd92fa990764b72608a68224f46fac377032;hp=5e920343b2c598595f2c068455e17d7d360c5a4f;hpb=c92758ceda477b1333fde35327cfa867dcc47bd1;p=linux-2.6

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 5e920343b2..5a98aa87c8 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -46,7 +46,7 @@ const struct file_operations jffs2_file_operations =
  	.aio_read =	generic_file_aio_read,
  	.write =	do_sync_write,
  	.aio_write =	generic_file_aio_write,
-	.ioctl =	jffs2_ioctl,
+	.unlocked_ioctl=jffs2_ioctl,
 	.mmap =		generic_file_readonly_mmap,
 	.fsync =	jffs2_fsync,
 	.splice_read =	generic_file_splice_read,