2023-07-13 11:38:35

by Ajay Kaher

[permalink] [raw]
Subject: [PATCH v4 02/10] tracefs: Rename some tracefs function

Renaming following functions as these would require by eventfs
as well:

start_creating -> tracefs_start_creating
failed_creating -> tracefs_failed_creating
end_creating -> tracefs_end_creating

Signed-off-by: Ajay Kaher <[email protected]>
Co-developed-by: Steven Rostedt (VMware) <[email protected]>
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
Tested-by: Ching-lin Yu <[email protected]>
---
fs/tracefs/inode.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
index 57ac8aa4a724..b0348efc0238 100644
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@ -399,7 +399,7 @@ static struct file_system_type trace_fs_type = {
};
MODULE_ALIAS_FS("tracefs");

-static struct dentry *start_creating(const char *name, struct dentry *parent)
+static struct dentry *tracefs_start_creating(const char *name, struct dentry *parent)
{
struct dentry *dentry;
int error;
@@ -437,7 +437,7 @@ static struct dentry *start_creating(const char *name, struct dentry *parent)
return dentry;
}

-static struct dentry *failed_creating(struct dentry *dentry)
+static struct dentry *tracefs_failed_creating(struct dentry *dentry)
{
inode_unlock(d_inode(dentry->d_parent));
dput(dentry);
@@ -445,7 +445,7 @@ static struct dentry *failed_creating(struct dentry *dentry)
return NULL;
}

-static struct dentry *end_creating(struct dentry *dentry)
+static struct dentry *tracefs_end_creating(struct dentry *dentry)
{
inode_unlock(d_inode(dentry->d_parent));
return dentry;
@@ -490,14 +490,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 +506,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 +520,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 +534,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);
}

/**
--
2.39.0



2023-07-14 16:07:32

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH v4 02/10] tracefs: Rename some tracefs function


Some nits.

First, the subject should be:

tracefs: Rename and export some tracefs functions

Yes, we should export them here too, even though they are not used yet.

On Thu, 13 Jul 2023 17:03:16 +0530
Ajay Kaher <[email protected]> wrote:

> Renaming following functions as these would require by eventfs
> as well:

I would have this state:

Export a few tracefs functions that will be needed by the eventfs dynamic
file system. Rename them to start with "tracefs_" to keep with the name
space.

>
> start_creating -> tracefs_start_creating
> failed_creating -> tracefs_failed_creating
> end_creating -> tracefs_end_creating
>
> Signed-off-by: Ajay Kaher <[email protected]>
> Co-developed-by: Steven Rostedt (VMware) <[email protected]>
> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
> Tested-by: Ching-lin Yu <[email protected]>
> ---
> fs/tracefs/inode.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
> index 57ac8aa4a724..b0348efc0238 100644
> --- a/fs/tracefs/inode.c
> +++ b/fs/tracefs/inode.c
> @@ -399,7 +399,7 @@ static struct file_system_type trace_fs_type = {
> };
> MODULE_ALIAS_FS("tracefs");
>
> -static struct dentry *start_creating(const char *name, struct dentry *parent)
> +static struct dentry *tracefs_start_creating(const char *name, struct dentry *parent)

Remove the static, and create the fs/tracefs/internal.h file in this patch.

-- Steve


> {
> struct dentry *dentry;
> int error;
> @@ -437,7 +437,7 @@ static struct dentry *start_creating(const char *name, struct dentry *parent)
> return dentry;
> }
>
> -static struct dentry *failed_creating(struct dentry *dentry)
> +static struct dentry *tracefs_failed_creating(struct dentry *dentry)
> {
> inode_unlock(d_inode(dentry->d_parent));
> dput(dentry);
> @@ -445,7 +445,7 @@ static struct dentry *failed_creating(struct dentry *dentry)
> return NULL;
> }
>
> -static struct dentry *end_creating(struct dentry *dentry)
> +static struct dentry *tracefs_end_creating(struct dentry *dentry)
> {
> inode_unlock(d_inode(dentry->d_parent));
> return dentry;
> @@ -490,14 +490,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 +506,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 +520,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 +534,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);
> }
>
> /**