1 files changed, 9 insertions, 13 deletions

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 0f5df73dbb73..12aca8ed605f 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -933,16 +933,11 @@ struct file *hugetlb_file_setup(const char *name, size_t size)
         if (!dentry)
                 goto out_shm_unlock;
 
-        error = -ENFILE;
-        file = get_empty_filp();
-        if (!file)
-                goto out_dentry;
-
         error = -ENOSPC;
         inode = hugetlbfs_get_inode(root->d_sb, current->fsuid,
                                 current->fsgid, S_IFREG | S_IRWXUGO, 0);
         if (!inode)
-                goto out_file;
+                goto out_dentry;
 
         error = -ENOMEM;
         if (hugetlb_reserve_pages(inode, 0, size >> HPAGE_SHIFT))
@@ -951,17 +946,18 @@ struct file *hugetlb_file_setup(const char *name, size_t size)
         d_instantiate(dentry, inode);
         inode->i_size = size;
         inode->i_nlink = 0;
-        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;
+
+        error = -ENFILE;
+        file = alloc_file(hugetlbfs_vfsmount, dentry,
+                        FMODE_WRITE | FMODE_READ,
+                        &hugetlbfs_file_operations);
+        if (!file)
+                goto out_inode;
+
         return file;
 
 out_inode:
         iput(inode);
-out_file:
-        put_filp(file);
 out_dentry:
         dput(dentry);
 out_shm_unlock: