On Thu, 1 Jun 2023 14:30:05 +0530
Ajay Kaher <akaher@xxxxxxxxxx> wrote:
> Introduce tracefs_inode structure, this will help eventfs
> to keep track of inode, flags and pointer to private date.
>
> Rename function names and remove the static qualifier for
> functions that should be exposed.
I think the removing static and renaming is OK, but please do not
introduce new 'tracefs_inode' and 'get_tracefs()' which are not used.
I think those should be merged with [3/10].
Thank you,
>
> Signed-off-by: Ajay Kaher <akaher@xxxxxxxxxx>
> Co-developed-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
> Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
> Tested-by: Ching-lin Yu <chinglinyu@xxxxxxxxxx>
> ---
> fs/tracefs/inode.c | 21 +++++++++++----------
> fs/tracefs/internal.h | 25 +++++++++++++++++++++++++
> 2 files changed, 36 insertions(+), 10 deletions(-)
> create mode 100644 fs/tracefs/internal.h
>
> diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
> index 57ac8aa4a..7df1752e8 100644
> --- a/fs/tracefs/inode.c
> +++ b/fs/tracefs/inode.c
> @@ -21,6 +21,7 @@
> #include <linux/parser.h>
> #include <linux/magic.h>
> #include <linux/slab.h>
> +#include "internal.h"
>
> #define TRACEFS_DEFAULT_MODE 0700
>
> @@ -127,7 +128,7 @@ static const struct inode_operations tracefs_dir_inode_operations = {
> .rmdir = tracefs_syscall_rmdir,
> };
>
> -static struct inode *tracefs_get_inode(struct super_block *sb)
> +struct inode *tracefs_get_inode(struct super_block *sb)
> {
> struct inode *inode = new_inode(sb);
> if (inode) {
> @@ -399,7 +400,7 @@ static struct file_system_type trace_fs_type = {
> };
> MODULE_ALIAS_FS("tracefs");
>
> -static struct dentry *start_creating(const char *name, struct dentry *parent)
> +struct dentry *tracefs_start_creating(const char *name, struct dentry *parent)
> {
> struct dentry *dentry;
> int error;
> @@ -437,7 +438,7 @@ static struct dentry *start_creating(const char *name, struct dentry *parent)
> return dentry;
> }
>
> -static struct dentry *failed_creating(struct dentry *dentry)
> +struct dentry *tracefs_failed_creating(struct dentry *dentry)
> {
> inode_unlock(d_inode(dentry->d_parent));
> dput(dentry);
> @@ -445,7 +446,7 @@ static struct dentry *failed_creating(struct dentry *dentry)
> return NULL;
> }
>
> -static struct dentry *end_creating(struct dentry *dentry)
> +struct dentry *tracefs_end_creating(struct dentry *dentry)
> {
> inode_unlock(d_inode(dentry->d_parent));
> return dentry;
> @@ -490,14 +491,14 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,
> if (!(mode & S_IFMT))
> mode |= S_IFREG;
> BUG_ON(!S_ISREG(mode));
> - dentry = start_creating(name, parent);
> + dentry = tracefs_start_creating(name, parent);
>
> if (IS_ERR(dentry))
> return NULL;
>
> inode = tracefs_get_inode(dentry->d_sb);
> if (unlikely(!inode))
> - return failed_creating(dentry);
> + return tracefs_failed_creating(dentry);
>
> inode->i_mode = mode;
> inode->i_fop = fops ? fops : &tracefs_file_operations;
> @@ -506,13 +507,13 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,
> inode->i_gid = d_inode(dentry->d_parent)->i_gid;
> d_instantiate(dentry, inode);
> fsnotify_create(d_inode(dentry->d_parent), dentry);
> - return end_creating(dentry);
> + return tracefs_end_creating(dentry);
> }
>
> static struct dentry *__create_dir(const char *name, struct dentry *parent,
> const struct inode_operations *ops)
> {
> - struct dentry *dentry = start_creating(name, parent);
> + struct dentry *dentry = tracefs_start_creating(name, parent);
> struct inode *inode;
>
> if (IS_ERR(dentry))
> @@ -520,7 +521,7 @@ static struct dentry *__create_dir(const char *name, struct dentry *parent,
>
> inode = tracefs_get_inode(dentry->d_sb);
> if (unlikely(!inode))
> - return failed_creating(dentry);
> + return tracefs_failed_creating(dentry);
>
> /* Do not set bits for OTH */
> inode->i_mode = S_IFDIR | S_IRWXU | S_IRUSR| S_IRGRP | S_IXUSR | S_IXGRP;
> @@ -534,7 +535,7 @@ static struct dentry *__create_dir(const char *name, struct dentry *parent,
> d_instantiate(dentry, inode);
> inc_nlink(d_inode(dentry->d_parent));
> fsnotify_mkdir(d_inode(dentry->d_parent), dentry);
> - return end_creating(dentry);
> + return tracefs_end_creating(dentry);
> }
>
> /**
> diff --git a/fs/tracefs/internal.h b/fs/tracefs/internal.h
> new file mode 100644
> index 000000000..6776b4693
> --- /dev/null
> +++ b/fs/tracefs/internal.h
> @@ -0,0 +1,25 @@
> +#ifndef _TRACEFS_INTERNAL_H
> +#define _TRACEFS_INTERNAL_H
> +
> +enum {
> + TRACEFS_EVENT_INODE = BIT(1),
> +};
> +
> +struct tracefs_inode {
> + unsigned long flags;
> + void *private;
> + struct inode vfs_inode;
> +};
> +
> +static inline struct tracefs_inode *get_tracefs(const struct inode *inode)
> +{
> + return container_of(inode, struct tracefs_inode, vfs_inode);
> +}
> +
> +struct dentry *tracefs_start_creating(const char *name, struct dentry *parent);
> +struct dentry *tracefs_end_creating(struct dentry *dentry);
> +struct dentry *tracefs_failed_creating(struct dentry *dentry);
> +struct inode *tracefs_get_inode(struct super_block *sb);
> +
> +#endif /* _TRACEFS_INTERNAL_H */
> +
> --
> 2.40.0
>
--
Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
