Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/fs/affs/dir.c b/fs/affs/dir.c
index 5d9649f..8ca8f3a 100644 (file)
--- a/fs/affs/dir.c
+++ b/fs/affs/dir.c
@@ -19,14 +19,15 @@ static int affs_readdir(struct file *, void *, filldir_t);
 
 const struct file_operations affs_dir_operations = {
        .read           = generic_read_dir,
+       .llseek         = generic_file_llseek,
        .readdir        = affs_readdir,
-       .fsync          = file_fsync,
+       .fsync          = affs_file_fsync,
 };
 
 /*
  * directories can handle most operations...
  */
-struct inode_operations affs_dir_inode_operations = {
+const struct inode_operations affs_dir_inode_operations = {
        .create         = affs_create,
        .lookup         = affs_lookup,
        .link           = affs_link,
@@ -41,7 +42,7 @@ struct inode_operations affs_dir_inode_operations = {
 static int
 affs_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;
        struct super_block      *sb = inode->i_sb;
        struct buffer_head      *dir_bh;
        struct buffer_head      *fh_bh;
@@ -71,7 +72,7 @@ affs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                stored++;
        }
        if (f_pos == 1) {
-               if (filldir(dirent, "..", 2, f_pos, parent_ino(filp->f_dentry), DT_DIR) < 0)
+               if (filldir(dirent, "..", 2, f_pos, parent_ino(filp->f_path.dentry), DT_DIR) < 0)
                        return stored;
                filp->f_pos = f_pos = 2;
                stored++;