vfs: introduce noop_llseek()

[safe/jmp/linux-2.6] / fs / qnx4 / dir.c

diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c
index 7a8f559..6f30c3d 100644 (file)
--- a/fs/qnx4/dir.c
+++ b/fs/qnx4/dir.c
@@ -11,19 +11,13 @@
  * 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>
-#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;
@@ -32,8 +26,8 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir)
        int ix, ino;
        int size;
 
-       QNX4DEBUG(("qnx4_readdir:i_size = %ld\n", (long) inode->i_size));
-       QNX4DEBUG(("filp->f_pos         = %ld\n", (long) filp->f_pos));
+       QNX4DEBUG((KERN_INFO "qnx4_readdir:i_size = %ld\n", (long) inode->i_size));
+       QNX4DEBUG((KERN_INFO "filp->f_pos         = %ld\n", (long) filp->f_pos));
 
        lock_kernel();
 
@@ -56,7 +50,7 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir)
                                        size = QNX4_NAME_MAX;
 
                                if ( ( de->di_status & (QNX4_FILE_USED|QNX4_FILE_LINK) ) != 0 ) {
-                                       QNX4DEBUG(("qnx4_readdir:%.*s\n", size, de->di_fname));
+                                       QNX4DEBUG((KERN_INFO "qnx4_readdir:%.*s\n", size, de->di_fname));
                                        if ( ( de->di_status & QNX4_FILE_LINK ) == 0 )
                                                ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1;
                                        else {
@@ -81,19 +75,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,
+       .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
-       .create         = qnx4_create,
-       .unlink         = qnx4_unlink,
-       .rmdir          = qnx4_rmdir,
-#endif
 };