lguest: turn Waker into a thread, not a process

[linux-2.6-omap-h63xx.git] / fs / qnx4 / dir.c

diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c
index 7a8f5595c26fea5898f1dfe246c8b86025b3e72a..ea9ffefb48add56ddace16e202e80d49b97859c5 100644 (file)
--- a/fs/qnx4/dir.c
+++ b/fs/qnx4/dir.c
@@ -11,7 +11,6 @@
  * 20-06-1998 by Frank Denis : Linux 2.1.99+ & dcache support.
  */
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -23,7 +22,7 @@
 
 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;
@@ -81,14 +80,14 @@ out:
        return 0;
 }
 
-struct file_operations qnx4_dir_operations =
+const struct file_operations qnx4_dir_operations =
 {
        .read           = generic_read_dir,
        .readdir        = qnx4_readdir,
        .fsync          = file_fsync,
 };
 
-struct inode_operations qnx4_dir_inode_operations =
+const struct inode_operations qnx4_dir_inode_operations =
 {
        .lookup         = qnx4_lookup,
 #ifdef CONFIG_QNX4FS_RW