[PATCH 8/8] tracefs: switch to simplefs inode creation API

There is no semantic change intended; the code in the simplefs.c functions =
in
fact was derived from debugfs and tracefs code.

Signed-off-by: Emanuele Giuseppe Esposito <[email protected]>
---
 fs/tracefs/inode.c | 86 ++++------------------------------------------
 1 file changed, 7 insertions(+), 79 deletions(-)

diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
index a30837a8e1d4..69e2215c797b 100644
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@ -298,57 +298,6 @@ static struct file_system_type trace_fs_type =3D {
 };
 MODULE_ALIAS_FS("tracefs");
=20
-static struct dentry *start_creating(const char *name, struct dentry *pare=
nt)
-{
-=09struct dentry *dentry;
-=09int error;
-
-=09pr_debug("tracefs: creating file '%s'\n",name);
-
-=09error =3D simple_pin_fs(&tracefs, &trace_fs_type);
-=09if (error)
-=09=09return ERR_PTR(error);
-
-=09/* If the parent is not specified, we create it in the root.
-=09 * We need the root dentry to do this, which is in the super
-=09 * block. A pointer to that is in the struct vfsmount that we
-=09 * have around.
-=09 */
-=09if (!parent)
-=09=09parent =3D tracefs.mount->mnt_root;
-
-=09inode_lock(parent->d_inode);
-=09if (unlikely(IS_DEADDIR(parent->d_inode)))
-=09=09dentry =3D ERR_PTR(-ENOENT);
-=09else
-=09=09dentry =3D lookup_one_len(name, parent, strlen(name));
-=09if (!IS_ERR(dentry) && dentry->d_inode) {
-=09=09dput(dentry);
-=09=09dentry =3D ERR_PTR(-EEXIST);
-=09}
-
-=09if (IS_ERR(dentry)) {
-=09=09inode_unlock(parent->d_inode);
-=09=09simple_release_fs(&tracefs);
-=09}
-
-=09return dentry;
-}
-
-static struct dentry *failed_creating(struct dentry *dentry)
-{
-=09inode_unlock(dentry->d_parent->d_inode);
-=09dput(dentry);
-=09simple_release_fs(&tracefs);
-=09return NULL;
-}
-
-static struct dentry *end_creating(struct dentry *dentry)
-{
-=09inode_unlock(dentry->d_parent->d_inode);
-=09return dentry;
-}
-
 /**
  * tracefs_create_file - create a file in the tracefs filesystem
  * @name: a pointer to a string containing the name of the file to create.
@@ -385,49 +334,28 @@ struct dentry *tracefs_create_file(const char *name, =
umode_t mode,
 =09if (security_locked_down(LOCKDOWN_TRACEFS))
 =09=09return NULL;
=20
-=09if (!(mode & S_IFMT))
-=09=09mode |=3D S_IFREG;
-=09BUG_ON(!S_ISREG(mode));
-=09dentry =3D start_creating(name, parent);
-
+=09dentry =3D simplefs_create_file(&tracefs, &trace_fs_type,
+=09=09=09=09      name, mode, parent, data, &inode);
 =09if (IS_ERR(dentry))
 =09=09return NULL;
=20
-=09inode =3D simple_new_inode(dentry->d_sb);
-=09if (unlikely(!inode))
-=09=09return failed_creating(dentry);
-
-=09inode->i_mode =3D mode;
 =09inode->i_fop =3D fops ? fops : &tracefs_file_operations;
-=09inode->i_private =3D data;
-=09d_instantiate(dentry, inode);
-=09fsnotify_create(dentry->d_parent->d_inode, dentry);
-=09return end_creating(dentry);
+=09return simplefs_finish_dentry(dentry, inode);
 }
=20
 static struct dentry *__create_dir(const char *name, struct dentry *parent=
,
 =09=09=09=09   const struct inode_operations *ops)
 {
-=09struct dentry *dentry =3D start_creating(name, parent);
+=09struct dentry *dentry;
 =09struct inode *inode;
=20
+=09dentry =3D simplefs_create_dir(&tracefs, &trace_fs_type,
+=09=09=09=09     name, 0755, parent, &inode);
 =09if (IS_ERR(dentry))
 =09=09return NULL;
=20
-=09inode =3D simple_new_inode(dentry->d_sb);
-=09if (unlikely(!inode))
-=09=09return failed_creating(dentry);
-
-=09inode->i_mode =3D S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
 =09inode->i_op =3D ops;
-=09inode->i_fop =3D &simple_dir_operations;
-
-=09/* directory inodes start off with i_nlink =3D=3D 2 (for "." entry) */
-=09inc_nlink(inode);
-=09d_instantiate(dentry, inode);
-=09inc_nlink(dentry->d_parent->d_inode);
-=09fsnotify_mkdir(dentry->d_parent->d_inode, dentry);
-=09return end_creating(dentry);
+=09return simplefs_finish_dentry(dentry, inode);
 }
=20
 /**
--=20
2.25.2