Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / fs / ext2 / dir.c

diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index b0e7d9f..0b02ba9 100644 (file)
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -112,7 +112,7 @@ static void ext2_check_page(struct page *page)
        if (offs != limit)
                goto Eend;
 out:
-       SetPageFsMisc(page);
+       SetPageChecked(page);
        return;
 
        /* Too bad, we had an error */
@@ -152,7 +152,7 @@ Eend:
                dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
                (unsigned long) le32_to_cpu(p->inode));
 fail:
-       SetPageFsMisc(page);
+       SetPageChecked(page);
        SetPageError(page);
 }
 
@@ -165,7 +165,7 @@ static struct page * ext2_get_page(struct inode *dir, unsigned long n)
                kmap(page);
                if (!PageUptodate(page))
                        goto fail;
-               if (!PageFsMisc(page))
+               if (!PageChecked(page))
                        ext2_check_page(page);
                if (PageError(page))
                        goto fail;
@@ -248,7 +248,7 @@ static int
 ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
 {
        loff_t pos = filp->f_pos;
-       struct inode *inode = filp->f_dentry->d_inode;
+       struct inode *inode = filp->f_path.dentry->d_inode;
        struct super_block *sb = inode->i_sb;
        unsigned int offset = pos & ~PAGE_CACHE_MASK;
        unsigned long n = pos >> PAGE_CACHE_SHIFT;
@@ -661,5 +661,8 @@ const struct file_operations ext2_dir_operations = {
        .read           = generic_read_dir,
        .readdir        = ext2_readdir,
        .ioctl          = ext2_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = ext2_compat_ioctl,
+#endif
        .fsync          = ext2_sync_file,
 };