From: Hao Lee <haolee.swjtu@gmail.com>
To: viro@zeniv.linux.org.uk
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fs: Eliminate a local variable to make the code more clear
Date: Tue, 8 Sep 2020 13:06:56 +0000 [thread overview]
Message-ID: <20200908130656.GC22780@haolee.github.io> (raw)
In-Reply-To: <20200729151740.GA3430@haolee.github.io>
ping
On Wed, Jul 29, 2020 at 03:21:28PM +0000, Hao Lee wrote:
> The dentry local variable is introduced in 'commit 84d17192d2afd ("get
> rid of full-hash scan on detaching vfsmounts")' to reduce the length of
> some long statements for example
> mutex_lock(&path->dentry->d_inode->i_mutex). We have already used
> inode_lock(dentry->d_inode) to do the same thing now, and its length is
> acceptable. Furthermore, it seems not concise that assign path->dentry
> to local variable dentry in the statement before goto. So, this function
> would be more clear if we eliminate the local variable dentry.
>
> The function logic is not changed.
>
> Signed-off-by: Hao Lee <haolee.swjtu@gmail.com>
> ---
> fs/namespace.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/fs/namespace.c b/fs/namespace.c
> index 4a0f600a3328..fcb93586fcc9 100644
> --- a/fs/namespace.c
> +++ b/fs/namespace.c
> @@ -2187,20 +2187,19 @@ static int attach_recursive_mnt(struct mount *source_mnt,
> static struct mountpoint *lock_mount(struct path *path)
> {
> struct vfsmount *mnt;
> - struct dentry *dentry = path->dentry;
> retry:
> - inode_lock(dentry->d_inode);
> - if (unlikely(cant_mount(dentry))) {
> - inode_unlock(dentry->d_inode);
> + inode_lock(path->dentry->d_inode);
> + if (unlikely(cant_mount(path->dentry))) {
> + inode_unlock(path->dentry->d_inode);
> return ERR_PTR(-ENOENT);
> }
> namespace_lock();
> mnt = lookup_mnt(path);
> if (likely(!mnt)) {
> - struct mountpoint *mp = get_mountpoint(dentry);
> + struct mountpoint *mp = get_mountpoint(path->dentry);
> if (IS_ERR(mp)) {
> namespace_unlock();
> - inode_unlock(dentry->d_inode);
> + inode_unlock(path->dentry->d_inode);
> return mp;
> }
> return mp;
> @@ -2209,7 +2208,7 @@ static struct mountpoint *lock_mount(struct path *path)
> inode_unlock(path->dentry->d_inode);
> path_put(path);
> path->mnt = mnt;
> - dentry = path->dentry = dget(mnt->mnt_root);
> + path->dentry = dget(mnt->mnt_root);
> goto retry;
> }
>
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-09-08 19:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 15:21 [PATCH] fs: Eliminate a local variable to make the code more clear Hao Lee
2020-08-14 6:01 ` Hao Lee
2020-09-08 13:06 ` Hao Lee [this message]
2020-09-08 18:48 ` Al Viro
2020-09-08 23:11 ` Hao Lee
2020-09-09 12:54 ` Eric W. Biederman
2020-09-09 15:32 ` Hao Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200908130656.GC22780@haolee.github.io \
--to=haolee.swjtu@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).