X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fext4%2Ffile.c;h=4159be6366ab8c7fb39493827765544d818b0ecc;hb=7477827f6686ce29b6216d9eb26f6b9027742dcc;hp=ac35ec58db55c9e9fe4b4d3effde74274b614b25;hpb=c64768a7d671bcde80bca2aed93f9e07edc069c3;p=linux-2.6

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index ac35ec58db..4159be6366 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -21,8 +21,8 @@
 #include <linux/time.h>
 #include <linux/fs.h>
 #include <linux/jbd2.h>
-#include <linux/ext4_fs.h>
-#include <linux/ext4_jbd2.h>
+#include "ext4.h"
+#include "ext4_jbd2.h"
 #include "xattr.h"
 #include "acl.h"
 
@@ -129,7 +129,7 @@ const struct file_operations ext4_file_operations = {
 	.write		= do_sync_write,
 	.aio_read	= generic_file_aio_read,
 	.aio_write	= ext4_file_write,
-	.ioctl		= ext4_ioctl,
+	.unlocked_ioctl = ext4_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl	= ext4_compat_ioctl,
 #endif