From: Ian Kent <raven@themaw.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>,
rui.xiang@huawei.com,
autofs mailing list <autofs@vger.kernel.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: [PATCH 3/3] autofs: use IS_ROOT to replace root dentry checks
Date: Wed, 04 Sep 2013 08:55:11 +0800 [thread overview]
Message-ID: <20130904005510.5025.56622.stgit@perseus.fritz.box> (raw)
In-Reply-To: <20130904005456.5025.94309.stgit@perseus.fritz.box>
From: Rui Xiang <rui.xiang@huawei.com>
Use the helper macro !IS_ROOT to replace parent != dentry->d_parent.
Just clean up.
Signed-off-by: Rui Xiang <rui.xiang@huawei.com>
Acked-by: Ian Kent <raven@themaw.net>
---
fs/autofs4/root.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 92ef341..2caf36a 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -558,7 +558,7 @@ static int autofs4_dir_symlink(struct inode *dir,
dget(dentry);
atomic_inc(&ino->count);
p_ino = autofs4_dentry_ino(dentry->d_parent);
- if (p_ino && dentry->d_parent != dentry)
+ if (p_ino && !IS_ROOT(dentry))
atomic_inc(&p_ino->count);
dir->i_mtime = CURRENT_TIME;
@@ -593,7 +593,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
if (atomic_dec_and_test(&ino->count)) {
p_ino = autofs4_dentry_ino(dentry->d_parent);
- if (p_ino && dentry->d_parent != dentry)
+ if (p_ino && !IS_ROOT(dentry))
atomic_dec(&p_ino->count);
}
dput(ino->dentry);
@@ -732,7 +732,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, umode_t m
dget(dentry);
atomic_inc(&ino->count);
p_ino = autofs4_dentry_ino(dentry->d_parent);
- if (p_ino && dentry->d_parent != dentry)
+ if (p_ino && !IS_ROOT(dentry))
atomic_inc(&p_ino->count);
inc_nlink(dir);
dir->i_mtime = CURRENT_TIME;
next prev parent reply other threads:[~2013-09-04 0:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 0:54 [PATCH 1/3] autofs4 - fix device ioctl mount lookup Ian Kent
2013-09-04 0:55 ` [PATCH 2/3] autofs: fix the return value of autofs4_fill_super Ian Kent
2013-09-04 0:55 ` Ian Kent [this message]
2013-09-04 1:03 ` [PATCH 1/3] autofs4 - fix device ioctl mount lookup Al Viro
2013-09-04 2:00 ` Al Viro
2013-09-04 2:18 ` Linus Torvalds
2013-09-04 2:26 ` Al Viro
2013-09-04 2:42 ` Al Viro
2013-09-04 3:53 ` Ian Kent
2013-09-04 4:07 ` Ian Kent
2013-09-04 10:35 ` Jeff Layton
2013-09-06 8:38 ` Ian Kent
2013-09-06 8:54 ` Ian Kent
2013-09-06 10:11 ` Jeff Layton
2013-09-04 2:46 ` Ian Kent
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=20130904005510.5025.56622.stgit@perseus.fritz.box \
--to=raven@themaw.net \
--cc=autofs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rui.xiang@huawei.com \
--cc=torvalds@linux-foundation.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).