Patched in Tegra support.

2 files changed, 79 insertions, 425 deletions

diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index c5ca6ae5a30..90f76575c05 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -15,12 +15,9 @@
 
 #include <linux/module.h>
 #include <linux/fs.h>
-#include <linux/seq_file.h>
 #include <linux/pagemap.h>
 #include <linux/namei.h>
 #include <linux/debugfs.h>
-#include <linux/io.h>
-#include <linux/slab.h>
 
 static ssize_t default_read_file(struct file *file, char __user *buf,
                                  size_t count, loff_t *ppos)
@@ -34,10 +31,18 @@ static ssize_t default_write_file(struct file *file, const char __user *buf,
         return count;
 }
 
+static int default_open(struct inode *inode, struct file *file)
+{
+        if (inode->i_private)
+                file->private_data = inode->i_private;
+
+        return 0;
+}
+
 const struct file_operations debugfs_file_operations = {
         .read =         default_read_file,
         .write =        default_write_file,
-        .open =         simple_open,
+        .open =         default_open,
         .llseek =       noop_llseek,
 };
 
@@ -90,7 +95,7 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_u8_wo, NULL, debugfs_u8_set, "%llu\n");
  * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
  * code.
  */
-struct dentry *debugfs_create_u8(const char *name, umode_t mode,
+struct dentry *debugfs_create_u8(const char *name, mode_t mode,
                                  struct dentry *parent, u8 *value)
 {
         /* if there are no write bits set, make read only */
@@ -142,7 +147,7 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_u16_wo, NULL, debugfs_u16_set, "%llu\n");
  * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
  * code.
  */
-struct dentry *debugfs_create_u16(const char *name, umode_t mode,
+struct dentry *debugfs_create_u16(const char *name, mode_t mode,
                                   struct dentry *parent, u16 *value)
 {
         /* if there are no write bits set, make read only */
@@ -194,7 +199,7 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_u32_wo, NULL, debugfs_u32_set, "%llu\n");
  * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
  * code.
  */
-struct dentry *debugfs_create_u32(const char *name, umode_t mode,
+struct dentry *debugfs_create_u32(const char *name, mode_t mode,
                                  struct dentry *parent, u32 *value)
 {
         /* if there are no write bits set, make read only */
@@ -247,7 +252,7 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_u64_wo, NULL, debugfs_u64_set, "%llu\n");
  * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
  * code.
  */
-struct dentry *debugfs_create_u64(const char *name, umode_t mode,
+struct dentry *debugfs_create_u64(const char *name, mode_t mode,
                                  struct dentry *parent, u64 *value)
 {
         /* if there are no write bits set, make read only */
@@ -293,7 +298,7 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_x64, debugfs_u64_get, debugfs_u64_set, "0x%016llx\n
  * @value: a pointer to the variable that the file should read to and write
  *         from.
  */
-struct dentry *debugfs_create_x8(const char *name, umode_t mode,
+struct dentry *debugfs_create_x8(const char *name, mode_t mode,
                                  struct dentry *parent, u8 *value)
 {
         /* if there are no write bits set, make read only */
@@ -317,7 +322,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_x8);
  * @value: a pointer to the variable that the file should read to and write
  *         from.
  */
-struct dentry *debugfs_create_x16(const char *name, umode_t mode,
+struct dentry *debugfs_create_x16(const char *name, mode_t mode,
                                  struct dentry *parent, u16 *value)
 {
         /* if there are no write bits set, make read only */
@@ -341,7 +346,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_x16);
  * @value: a pointer to the variable that the file should read to and write
  *         from.
  */
-struct dentry *debugfs_create_x32(const char *name, umode_t mode,
+struct dentry *debugfs_create_x32(const char *name, mode_t mode,
                                  struct dentry *parent, u32 *value)
 {
         /* if there are no write bits set, make read only */
@@ -365,7 +370,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_x32);
  * @value: a pointer to the variable that the file should read to and write
  *         from.
  */
-struct dentry *debugfs_create_x64(const char *name, umode_t mode,
+struct dentry *debugfs_create_x64(const char *name, mode_t mode,
                                  struct dentry *parent, u64 *value)
 {
         return debugfs_create_file(name, mode, parent, value, &fops_x64);
@@ -396,7 +401,7 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_size_t, debugfs_size_t_get, debugfs_size_t_set,
  * @value: a pointer to the variable that the file should read to and write
  *         from.
  */
-struct dentry *debugfs_create_size_t(const char *name, umode_t mode,
+struct dentry *debugfs_create_size_t(const char *name, mode_t mode,
                                      struct dentry *parent, size_t *value)
 {
         return debugfs_create_file(name, mode, parent, value, &fops_size_t);
@@ -440,7 +445,7 @@ static ssize_t write_file_bool(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_bool = {
         .read =         read_file_bool,
         .write =        write_file_bool,
-        .open =         simple_open,
+        .open =         default_open,
         .llseek =       default_llseek,
 };
 
@@ -468,7 +473,7 @@ static const struct file_operations fops_bool = {
  * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
  * code.
  */
-struct dentry *debugfs_create_bool(const char *name, umode_t mode,
+struct dentry *debugfs_create_bool(const char *name, mode_t mode,
                                    struct dentry *parent, u32 *value)
 {
         return debugfs_create_file(name, mode, parent, value, &fops_bool);
@@ -485,7 +490,7 @@ static ssize_t read_file_blob(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_blob = {
         .read =         read_file_blob,
-        .open =         simple_open,
+        .open =         default_open,
         .llseek =       default_llseek,
 };
 
@@ -513,208 +518,10 @@ static const struct file_operations fops_blob = {
  * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
  * code.
  */
-struct dentry *debugfs_create_blob(const char *name, umode_t mode,
+struct dentry *debugfs_create_blob(const char *name, mode_t mode,
                                    struct dentry *parent,
                                    struct debugfs_blob_wrapper *blob)
 {
         return debugfs_create_file(name, mode, parent, blob, &fops_blob);
 }
 EXPORT_SYMBOL_GPL(debugfs_create_blob);
-
-struct array_data {
-        void *array;
-        u32 elements;
-};
-
-static size_t u32_format_array(char *buf, size_t bufsize,
-                               u32 *array, int array_size)
-{
-        size_t ret = 0;
-
-        while (--array_size >= 0) {
-                size_t len;
-                char term = array_size ? ' ' : '\n';
-
-                len = snprintf(buf, bufsize, "%u%c", *array++, term);
-                ret += len;
-
-                buf += len;
-                bufsize -= len;
-        }
-        return ret;
-}
-
-static int u32_array_open(struct inode *inode, struct file *file)
-{
-        struct array_data *data = inode->i_private;
-        int size, elements = data->elements;
-        char *buf;
-
-        /*
-         * Max size:
-         *  - 10 digits + ' '/'\n' = 11 bytes per number
-         *  - terminating NUL character
-         */
-        size = elements*11;
-        buf = kmalloc(size+1, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-        buf[size] = 0;
-
-        file->private_data = buf;
-        u32_format_array(buf, size, data->array, data->elements);
-
-        return nonseekable_open(inode, file);
-}
-
-static ssize_t u32_array_read(struct file *file, char __user *buf, size_t len,
-                              loff_t *ppos)
-{
-        size_t size = strlen(file->private_data);
-
-        return simple_read_from_buffer(buf, len, ppos,
-                                        file->private_data, size);
-}
-
-static int u32_array_release(struct inode *inode, struct file *file)
-{
-        kfree(file->private_data);
-
-        return 0;
-}
-
-static const struct file_operations u32_array_fops = {
-        .owner   = THIS_MODULE,
-        .open    = u32_array_open,
-        .release = u32_array_release,
-        .read    = u32_array_read,
-        .llseek  = no_llseek,
-};
-
-/**
- * debugfs_create_u32_array - create a debugfs file that is used to read u32
- * array.
- * @name: a pointer to a string containing the name of the file to create.
- * @mode: the permission that the file should have.
- * @parent: a pointer to the parent dentry for this file.  This should be a
- *          directory dentry if set.  If this parameter is %NULL, then the
- *          file will be created in the root of the debugfs filesystem.
- * @array: u32 array that provides data.
- * @elements: total number of elements in the array.
- *
- * This function creates a file in debugfs with the given name that exports
- * @array as data. If the @mode variable is so set it can be read from.
- * Writing is not supported. Seek within the file is also not supported.
- * Once array is created its size can not be changed.
- *
- * The function returns a pointer to dentry on success. If debugfs is not
- * enabled in the kernel, the value -%ENODEV will be returned.
- */
-struct dentry *debugfs_create_u32_array(const char *name, umode_t mode,
-                                            struct dentry *parent,
-                                            u32 *array, u32 elements)
-{
-        struct array_data *data = kmalloc(sizeof(*data), GFP_KERNEL);
-
-        if (data == NULL)
-                return NULL;
-
-        data->array = array;
-        data->elements = elements;
-
-        return debugfs_create_file(name, mode, parent, data, &u32_array_fops);
-}
-EXPORT_SYMBOL_GPL(debugfs_create_u32_array);
-
-#ifdef CONFIG_HAS_IOMEM
-
-/*
- * The regset32 stuff is used to print 32-bit registers using the
- * seq_file utilities. We offer printing a register set in an already-opened
- * sequential file or create a debugfs file that only prints a regset32.
- */
-
-/**
- * debugfs_print_regs32 - use seq_print to describe a set of registers
- * @s: the seq_file structure being used to generate output
- * @regs: an array if struct debugfs_reg32 structures
- * @nregs: the length of the above array
- * @base: the base address to be used in reading the registers
- * @prefix: a string to be prefixed to every output line
- *
- * This function outputs a text block describing the current values of
- * some 32-bit hardware registers. It is meant to be used within debugfs
- * files based on seq_file that need to show registers, intermixed with other
- * information. The prefix argument may be used to specify a leading string,
- * because some peripherals have several blocks of identical registers,
- * for example configuration of dma channels
- */
-int debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
-                           int nregs, void __iomem *base, char *prefix)
-{
-        int i, ret = 0;
-
-        for (i = 0; i < nregs; i++, regs++) {
-                if (prefix)
-                        ret += seq_printf(s, "%s", prefix);
-                ret += seq_printf(s, "%s = 0x%08x\n", regs->name,
-                                  readl(base + regs->offset));
-        }
-        return ret;
-}
-EXPORT_SYMBOL_GPL(debugfs_print_regs32);
-
-static int debugfs_show_regset32(struct seq_file *s, void *data)
-{
-        struct debugfs_regset32 *regset = s->private;
-
-        debugfs_print_regs32(s, regset->regs, regset->nregs, regset->base, "");
-        return 0;
-}
-
-static int debugfs_open_regset32(struct inode *inode, struct file *file)
-{
-        return single_open(file, debugfs_show_regset32, inode->i_private);
-}
-
-static const struct file_operations fops_regset32 = {
-        .open =         debugfs_open_regset32,
-        .read =         seq_read,
-        .llseek =       seq_lseek,
-        .release =      single_release,
-};
-
-/**
- * debugfs_create_regset32 - create a debugfs file that returns register values
- * @name: a pointer to a string containing the name of the file to create.
- * @mode: the permission that the file should have
- * @parent: a pointer to the parent dentry for this file.  This should be a
- *          directory dentry if set.  If this parameter is %NULL, then the
- *          file will be created in the root of the debugfs filesystem.
- * @regset: a pointer to a struct debugfs_regset32, which contains a pointer
- *          to an array of register definitions, the array size and the base
- *          address where the register bank is to be found.
- *
- * This function creates a file in debugfs with the given name that reports
- * the names and values of a set of 32-bit registers. If the @mode variable
- * is so set it can be read from. Writing is not supported.
- *
- * This function will return a pointer to a dentry if it succeeds.  This
- * pointer must be passed to the debugfs_remove() function when the file is
- * to be removed (no automatic cleanup happens if your module is unloaded,
- * you are responsible here.)  If an error occurs, %NULL will be returned.
- *
- * If debugfs is not enabled in the kernel, the value -%ENODEV will be
- * returned.  It is not wise to check for this value, but rather, check for
- * %NULL or !%NULL instead as to eliminate the need for #ifdef in the calling
- * code.
- */
-struct dentry *debugfs_create_regset32(const char *name, umode_t mode,
-                                       struct dentry *parent,
-                                       struct debugfs_regset32 *regset)
-{
-        return debugfs_create_file(name, mode, parent, regset, &fops_regset32);
-}
-EXPORT_SYMBOL_GPL(debugfs_create_regset32);
-
-#endif /* CONFIG_HAS_IOMEM */
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index a5f12b7e228..e7a7a2f0732 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -1,5 +1,5 @@
 /*
- *  inode.c - part of debugfs, a tiny little debug file system
+ *  file.c - part of debugfs, a tiny little debug file system
  *
  *  Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
  *  Copyright (C) 2004 IBM Inc.
@@ -23,18 +23,14 @@
 #include <linux/debugfs.h>
 #include <linux/fsnotify.h>
 #include <linux/string.h>
-#include <linux/seq_file.h>
-#include <linux/parser.h>
 #include <linux/magic.h>
 #include <linux/slab.h>
 
-#define DEBUGFS_DEFAULT_MODE    0700
-
 static struct vfsmount *debugfs_mount;
 static int debugfs_mount_count;
 static bool debugfs_registered;
 
-static struct inode *debugfs_get_inode(struct super_block *sb, umode_t mode, dev_t dev,
+static struct inode *debugfs_get_inode(struct super_block *sb, int mode, dev_t dev,
                                        void *data, const struct file_operations *fops)
 
 {
@@ -54,11 +50,13 @@ static struct inode *debugfs_get_inode(struct super_block *sb, umode_t mode, dev
                         break;
                 case S_IFLNK:
                         inode->i_op = &debugfs_link_operations;
+                        inode->i_fop = fops;
                         inode->i_private = data;
                         break;
                 case S_IFDIR:
                         inode->i_op = &simple_dir_inode_operations;
-                        inode->i_fop = &simple_dir_operations;
+                        inode->i_fop = fops ? fops : &simple_dir_operations;
+                        inode->i_private = data;
 
                         /* directory inodes start off with i_nlink == 2
                          * (for "." entry) */
@@ -71,7 +69,7 @@ static struct inode *debugfs_get_inode(struct super_block *sb, umode_t mode, dev
 
 /* SMP-safe */
 static int debugfs_mknod(struct inode *dir, struct dentry *dentry,
-                         umode_t mode, dev_t dev, void *data,
+                         int mode, dev_t dev, void *data,
                          const struct file_operations *fops)
 {
         struct inode *inode;
@@ -89,12 +87,13 @@ static int debugfs_mknod(struct inode *dir, struct dentry *dentry,
         return error;
 }
 
-static int debugfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int debugfs_mkdir(struct inode *dir, struct dentry *dentry, int mode,
+                         void *data, const struct file_operations *fops)
 {
         int res;
 
         mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
-        res = debugfs_mknod(dir, dentry, mode, 0, NULL, NULL);
+        res = debugfs_mknod(dir, dentry, mode, 0, data, fops);
         if (!res) {
                 inc_nlink(dir);
                 fsnotify_mkdir(dir, dentry);
@@ -102,14 +101,14 @@ static int debugfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
         return res;
 }
 
-static int debugfs_link(struct inode *dir, struct dentry *dentry, umode_t mode,
-                        void *data)
+static int debugfs_link(struct inode *dir, struct dentry *dentry, int mode,
+                        void *data, const struct file_operations *fops)
 {
         mode = (mode & S_IALLUGO) | S_IFLNK;
-        return debugfs_mknod(dir, dentry, mode, 0, data, NULL);
+        return debugfs_mknod(dir, dentry, mode, 0, data, fops);
 }
 
-static int debugfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+static int debugfs_create(struct inode *dir, struct dentry *dentry, int mode,
                           void *data, const struct file_operations *fops)
 {
         int res;
@@ -126,164 +125,11 @@ static inline int debugfs_positive(struct dentry *dentry)
         return dentry->d_inode && !d_unhashed(dentry);
 }
 
-struct debugfs_mount_opts {
-        kuid_t uid;
-        kgid_t gid;
-        umode_t mode;
-};
-
-enum {
-        Opt_uid,
-        Opt_gid,
-        Opt_mode,
-        Opt_err
-};
-
-static const match_table_t tokens = {
-        {Opt_uid, "uid=%u"},
-        {Opt_gid, "gid=%u"},
-        {Opt_mode, "mode=%o"},
-        {Opt_err, NULL}
-};
-
-struct debugfs_fs_info {
-        struct debugfs_mount_opts mount_opts;
-};
-
-static int debugfs_parse_options(char *data, struct debugfs_mount_opts *opts)
-{
-        substring_t args[MAX_OPT_ARGS];
-        int option;
-        int token;
-        kuid_t uid;
-        kgid_t gid;
-        char *p;
-
-        opts->mode = DEBUGFS_DEFAULT_MODE;
-
-        while ((p = strsep(&data, ",")) != NULL) {
-                if (!*p)
-                        continue;
-
-                token = match_token(p, tokens, args);
-                switch (token) {
-                case Opt_uid:
-                        if (match_int(&args[0], &option))
-                                return -EINVAL;
-                        uid = make_kuid(current_user_ns(), option);
-                        if (!uid_valid(uid))
-                                return -EINVAL;
-                        opts->uid = uid;
-                        break;
-                case Opt_gid:
-                        if (match_int(&args[0], &option))
-                                return -EINVAL;
-                        gid = make_kgid(current_user_ns(), option);
-                        if (!gid_valid(gid))
-                                return -EINVAL;
-                        opts->gid = gid;
-                        break;
-                case Opt_mode:
-                        if (match_octal(&args[0], &option))
-                                return -EINVAL;
-                        opts->mode = option & S_IALLUGO;
-                        break;
-                /*
-                 * We might like to report bad mount options here;
-                 * but traditionally debugfs has ignored all mount options
-                 */
-                }
-        }
-
-        return 0;
-}
-
-static int debugfs_apply_options(struct super_block *sb)
-{
-        struct debugfs_fs_info *fsi = sb->s_fs_info;
-        struct inode *inode = sb->s_root->d_inode;
-        struct debugfs_mount_opts *opts = &fsi->mount_opts;
-
-        inode->i_mode &= ~S_IALLUGO;
-        inode->i_mode |= opts->mode;
-
-        inode->i_uid = opts->uid;
-        inode->i_gid = opts->gid;
-
-        return 0;
-}
-
-static int debugfs_remount(struct super_block *sb, int *flags, char *data)
-{
-        int err;
-        struct debugfs_fs_info *fsi = sb->s_fs_info;
-
-        err = debugfs_parse_options(data, &fsi->mount_opts);
-        if (err)
-                goto fail;
-
-        debugfs_apply_options(sb);
-
-fail:
-        return err;
-}
-
-static int debugfs_show_options(struct seq_file *m, struct dentry *root)
-{
-        struct debugfs_fs_info *fsi = root->d_sb->s_fs_info;
-        struct debugfs_mount_opts *opts = &fsi->mount_opts;
-
-        if (!uid_eq(opts->uid, GLOBAL_ROOT_UID))
-                seq_printf(m, ",uid=%u",
-                           from_kuid_munged(&init_user_ns, opts->uid));
-        if (!gid_eq(opts->gid, GLOBAL_ROOT_GID))
-                seq_printf(m, ",gid=%u",
-                           from_kgid_munged(&init_user_ns, opts->gid));
-        if (opts->mode != DEBUGFS_DEFAULT_MODE)
-                seq_printf(m, ",mode=%o", opts->mode);
-
-        return 0;
-}
-
-static const struct super_operations debugfs_super_operations = {
-        .statfs         = simple_statfs,
-        .remount_fs     = debugfs_remount,
-        .show_options   = debugfs_show_options,
-};
-
 static int debug_fill_super(struct super_block *sb, void *data, int silent)
 {
         static struct tree_descr debug_files[] = {{""}};
-        struct debugfs_fs_info *fsi;
-        int err;
-
-        save_mount_options(sb, data);
-
-        fsi = kzalloc(sizeof(struct debugfs_fs_info), GFP_KERNEL);
-        sb->s_fs_info = fsi;
-        if (!fsi) {
-                err = -ENOMEM;
-                goto fail;
-        }
-
-        err = debugfs_parse_options(data, &fsi->mount_opts);
-        if (err)
-                goto fail;
-
-        err  =  simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
-        if (err)
-                goto fail;
 
-        sb->s_op = &debugfs_super_operations;
-
-        debugfs_apply_options(sb);
-
-        return 0;
-
-fail:
-        kfree(fsi);
-        sb->s_fs_info = NULL;
-        return err;
+        return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
 }
 
 static struct dentry *debug_mount(struct file_system_type *fs_type,
@@ -300,19 +146,13 @@ static struct file_system_type debug_fs_type = {
         .kill_sb =      kill_litter_super,
 };
 
-static struct dentry *__create_file(const char *name, umode_t mode,
-                                    struct dentry *parent, void *data,
-                                    const struct file_operations *fops)
+static int debugfs_create_by_name(const char *name, mode_t mode,
+                                  struct dentry *parent,
+                                  struct dentry **dentry,
+                                  void *data,
+                                  const struct file_operations *fops)
 {
-        struct dentry *dentry = NULL;
-        int error;
-
-        pr_debug("debugfs: creating file '%s'\n",name);
-
-        error = simple_pin_fs(&debug_fs_type, &debugfs_mount,
-                              &debugfs_mount_count);
-        if (error)
-                goto exit;
+        int error = 0;
 
         /* If the parent is not specified, we create it in the root.
          * We need the root dentry to do this, which is in the super 
@@ -320,37 +160,32 @@ static struct dentry *__create_file(const char *name, umode_t mode,
          * have around.
          */
         if (!parent)
-                parent = debugfs_mount->mnt_root;
+                parent = debugfs_mount->mnt_sb->s_root;
 
-        dentry = NULL;
+        *dentry = NULL;
         mutex_lock(&parent->d_inode->i_mutex);
-        dentry = lookup_one_len(name, parent, strlen(name));
-        if (!IS_ERR(dentry)) {
+        *dentry = lookup_one_len(name, parent, strlen(name));
+        if (!IS_ERR(*dentry)) {
                 switch (mode & S_IFMT) {
                 case S_IFDIR:
-                        error = debugfs_mkdir(parent->d_inode, dentry, mode);
-                                              
+                        error = debugfs_mkdir(parent->d_inode, *dentry, mode,
+                                              data, fops);
                         break;
                 case S_IFLNK:
-                        error = debugfs_link(parent->d_inode, dentry, mode,
-                                             data);
+                        error = debugfs_link(parent->d_inode, *dentry, mode,
+                                             data, fops);
                         break;
                 default:
-                        error = debugfs_create(parent->d_inode, dentry, mode,
+                        error = debugfs_create(parent->d_inode, *dentry, mode,
                                                data, fops);
                         break;
                 }
-                dput(dentry);
+                dput(*dentry);
         } else
-                error = PTR_ERR(dentry);
+                error = PTR_ERR(*dentry);
         mutex_unlock(&parent->d_inode->i_mutex);
 
-        if (error) {
-                dentry = NULL;
-                simple_release_fs(&debugfs_mount, &debugfs_mount_count);
-        }
-exit:
-        return dentry;
+        return error;
 }
 
 /**
@@ -379,19 +214,29 @@ exit:
  * If debugfs is not enabled in the kernel, the value -%ENODEV will be
  * returned.
  */
-struct dentry *debugfs_create_file(const char *name, umode_t mode,
+struct dentry *debugfs_create_file(const char *name, mode_t mode,
                                    struct dentry *parent, void *data,
                                    const struct file_operations *fops)
 {
-        switch (mode & S_IFMT) {
-        case S_IFREG:
-        case 0:
-                break;
-        default:
-                BUG();
-        }
+        struct dentry *dentry = NULL;
+        int error;
+
+        pr_debug("debugfs: creating file '%s'\n",name);
 
-        return __create_file(name, mode, parent, data, fops);
+        error = simple_pin_fs(&debug_fs_type, &debugfs_mount,
+                              &debugfs_mount_count);
+        if (error)
+                goto exit;
+
+        error = debugfs_create_by_name(name, mode, parent, &dentry,
+                                       data, fops);
+        if (error) {
+                dentry = NULL;
+                simple_release_fs(&debugfs_mount, &debugfs_mount_count);
+                goto exit;
+        }
+exit:
+        return dentry;
 }
 EXPORT_SYMBOL_GPL(debugfs_create_file);
 
@@ -415,7 +260,8 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
  */
 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
 {
-        return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
+        return debugfs_create_file(name, 
+                                   S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
                                    parent, NULL, NULL);
 }
 EXPORT_SYMBOL_GPL(debugfs_create_dir);
@@ -453,7 +299,8 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
         if (!link)
                 return NULL;
 
-        result = __create_file(name, S_IFLNK | S_IRWXUGO, parent, link, NULL);
+        result = debugfs_create_file(name, S_IFLNK | S_IRWXUGO, parent, link,
+                                     NULL);
         if (!result)
                 kfree(link);
         return result;
@@ -504,7 +351,7 @@ void debugfs_remove(struct dentry *dentry)
         struct dentry *parent;
         int ret;
 
-        if (IS_ERR_OR_NULL(dentry))
+        if (!dentry)
                 return;
 
         parent = dentry->d_parent;
@@ -536,7 +383,7 @@ void debugfs_remove_recursive(struct dentry *dentry)
         struct dentry *child;
         struct dentry *parent;
 
-        if (IS_ERR_OR_NULL(dentry))
+        if (!dentry)
                 return;
 
         parent = dentry->d_parent;