X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fqnx4%2Fdir.c;h=003c68f3238b47d1686a41b7232b1cfd885eb93e;hb=61fe087059614226978f4d7bb36da26cb2d28f9f;hp=0d7103fa0df5c253217f313f0d5b9599867216ab;hpb=e37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb;p=mv-sheeva.git

diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c
index 0d7103fa0df..003c68f3238 100644
--- a/fs/qnx4/dir.c
+++ b/fs/qnx4/dir.c
@@ -11,18 +11,13 @@
  * 20-06-1998 by Frank Denis : Linux 2.1.99+ & dcache support.
  */
 
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/qnx4_fs.h>
-#include <linux/stat.h>
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
-
+#include "qnx4.h"
 
 static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
-	struct inode *inode = filp->f_dentry->d_inode;
+	struct inode *inode = filp->f_path.dentry->d_inode;
 	unsigned int offset;
 	struct buffer_head *bh;
 	struct qnx4_inode_entry *de;
@@ -84,10 +79,10 @@ const struct file_operations qnx4_dir_operations =
 {
 	.read		= generic_read_dir,
 	.readdir	= qnx4_readdir,
-	.fsync		= file_fsync,
+	.fsync		= simple_fsync,
 };
 
-struct inode_operations qnx4_dir_inode_operations =
+const struct inode_operations qnx4_dir_inode_operations =
 {
 	.lookup		= qnx4_lookup,
 #ifdef CONFIG_QNX4FS_RW