1 files changed, 7 insertions, 7 deletions

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 7f4756963d05..4f4cd132b571 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -58,7 +58,7 @@ static void huge_pagevec_release(struct pagevec *pvec)
 
 static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct inode *inode = file->f_dentry->d_inode;
+        struct inode *inode = file->f_path.dentry->d_inode;
         loff_t len, vma_len;
         int ret;
 
@@ -176,7 +176,7 @@ static int hugetlbfs_commit_write(struct file *file,
 
 static void truncate_huge_page(struct page *page)
 {
-        clear_page_dirty(page);
+        cancel_dirty_page(page, /* No IO accounting for huge pages? */0);
         ClearPageUptodate(page);
         remove_from_page_cache(page);
         put_page(page);
@@ -513,7 +513,7 @@ static void hugetlbfs_inc_free_inodes(struct hugetlbfs_sb_info *sbinfo)
 }
 
 
-static kmem_cache_t *hugetlbfs_inode_cachep;
+static struct kmem_cache *hugetlbfs_inode_cachep;
 
 static struct inode *hugetlbfs_alloc_inode(struct super_block *sb)
 {
@@ -522,7 +522,7 @@ static struct inode *hugetlbfs_alloc_inode(struct super_block *sb)
 
         if (unlikely(!hugetlbfs_dec_free_inodes(sbinfo)))
                 return NULL;
-        p = kmem_cache_alloc(hugetlbfs_inode_cachep, SLAB_KERNEL);
+        p = kmem_cache_alloc(hugetlbfs_inode_cachep, GFP_KERNEL);
         if (unlikely(!p)) {
                 hugetlbfs_inc_free_inodes(sbinfo);
                 return NULL;
@@ -545,7 +545,7 @@ static const struct address_space_operations hugetlbfs_aops = {
 };
 
 
-static void init_once(void *foo, kmem_cache_t *cachep, unsigned long flags)
+static void init_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
 {
         struct hugetlbfs_inode_info *ei = (struct hugetlbfs_inode_info *)foo;
 
@@ -774,8 +774,8 @@ struct file *hugetlb_zero_setup(size_t size)
         d_instantiate(dentry, inode);
         inode->i_size = size;
         inode->i_nlink = 0;
-        file->f_vfsmnt = mntget(hugetlbfs_vfsmount);
-        file->f_dentry = dentry;
+        file->f_path.mnt = mntget(hugetlbfs_vfsmount);
+        file->f_path.dentry = dentry;
         file->f_mapping = inode->i_mapping;
         file->f_op = &hugetlbfs_file_operations;
         file->f_mode = FMODE_WRITE | FMODE_READ;