| Message ID | 20220820000550.367085-3-tj@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/7] kernfs: Simply by replacing kernfs_deref_open_node() with of_on() | expand |
On 2022/8/20 08:05, Tejun Heo wrote: > These are unnecessary and unconventional. Remove them. Also move variable > declaration into the block that it's used. No functional changes. > Reviewed-by: Chengming Zhou <zhouchengming@bytedance.com> Thanks. > Signed-off-by: Tejun Heo <tj@kernel.org> > Cc: Imran Khan <imran.f.khan@oracle.com> > --- > fs/kernfs/file.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c > index 32b16fe00a9e..6437f7c7162d 100644 > --- a/fs/kernfs/file.c > +++ b/fs/kernfs/file.c > @@ -555,7 +555,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn, > struct kernfs_open_file *of) > { > struct kernfs_open_node *on, *new_on = NULL; > - struct mutex *mutex = NULL; > + struct mutex *mutex; > > mutex = kernfs_open_file_mutex_lock(kn); > on = kernfs_deref_open_node_locked(kn); > @@ -599,7 +599,7 @@ static void kernfs_unlink_open_file(struct kernfs_node *kn, > struct kernfs_open_file *of) > { > struct kernfs_open_node *on; > - struct mutex *mutex = NULL; > + struct mutex *mutex; > > mutex = kernfs_open_file_mutex_lock(kn); > > @@ -776,9 +776,10 @@ static int kernfs_fop_release(struct inode *inode, struct file *filp) > { > struct kernfs_node *kn = inode->i_private; > struct kernfs_open_file *of = kernfs_of(filp); > - struct mutex *mutex = NULL; > > if (kn->flags & KERNFS_HAS_RELEASE) { > + struct mutex *mutex; > + > mutex = kernfs_open_file_mutex_lock(kn); > kernfs_release_file(kn, of); > mutex_unlock(mutex); > @@ -796,7 +797,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn) > { > struct kernfs_open_node *on; > struct kernfs_open_file *of; > - struct mutex *mutex = NULL; > + struct mutex *mutex; > > if (!(kn->flags & (KERNFS_HAS_MMAP | KERNFS_HAS_RELEASE))) > return;
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 32b16fe00a9e..6437f7c7162d 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -555,7 +555,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn, struct kernfs_open_file *of) { struct kernfs_open_node *on, *new_on = NULL; - struct mutex *mutex = NULL; + struct mutex *mutex; mutex = kernfs_open_file_mutex_lock(kn); on = kernfs_deref_open_node_locked(kn); @@ -599,7 +599,7 @@ static void kernfs_unlink_open_file(struct kernfs_node *kn, struct kernfs_open_file *of) { struct kernfs_open_node *on; - struct mutex *mutex = NULL; + struct mutex *mutex; mutex = kernfs_open_file_mutex_lock(kn); @@ -776,9 +776,10 @@ static int kernfs_fop_release(struct inode *inode, struct file *filp) { struct kernfs_node *kn = inode->i_private; struct kernfs_open_file *of = kernfs_of(filp); - struct mutex *mutex = NULL; if (kn->flags & KERNFS_HAS_RELEASE) { + struct mutex *mutex; + mutex = kernfs_open_file_mutex_lock(kn); kernfs_release_file(kn, of); mutex_unlock(mutex); @@ -796,7 +797,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn) { struct kernfs_open_node *on; struct kernfs_open_file *of; - struct mutex *mutex = NULL; + struct mutex *mutex; if (!(kn->flags & (KERNFS_HAS_MMAP | KERNFS_HAS_RELEASE))) return;
These are unnecessary and unconventional. Remove them. Also move variable declaration into the block that it's used. No functional changes. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Imran Khan <imran.f.khan@oracle.com> --- fs/kernfs/file.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)