Author: mjg
Date: Thu Jul 9 17:17:26 2015
New Revision: 285331
URL: https://svnweb.freebsd.org/changeset/base/285331
Log:
vfs: cosmetic changes to namei and namei_handle_root
- don't initialize cnp during declaration
- don't test error/!error, compare to 0 instead
Modified:
head/sys/kern/vfs_lookup.c
Modified: head/sys/kern/vfs_lookup.c
==============================================================================
--- head/sys/kern/vfs_lookup.c Thu Jul 9 17:17:22 2015 (r285330)
+++ head/sys/kern/vfs_lookup.c Thu Jul 9 17:17:26 2015 (r285331)
@@ -112,8 +112,9 @@ namei_cleanup_cnp(struct componentname *
static int
namei_handle_root(struct nameidata *ndp, struct vnode **dpp)
{
- struct componentname *cnp = &ndp->ni_cnd;
+ struct componentname *cnp;
+ cnp = &ndp->ni_cnd;
if (ndp->ni_strictrelative != 0) {
#ifdef KTRACE
if (KTRPOINT(curthread, KTR_CAPFAIL))
@@ -194,7 +195,7 @@ namei(struct nameidata *ndp)
/*
* Don't allow empty pathnames.
*/
- if (!error && *cnp->cn_pnbuf == '\0')
+ if (error == 0 && *cnp->cn_pnbuf == '\0')
error = ENOENT;
#ifdef CAPABILITY_MODE
@@ -215,7 +216,7 @@ namei(struct nameidata *ndp)
}
}
#endif
- if (error) {
+ if (error != 0) {
namei_cleanup_cnp(cnp);
ndp->ni_vp = NULL;
return (error);
@@ -301,7 +302,7 @@ namei(struct nameidata *ndp)
for (;;) {
ndp->ni_startdir = dp;
error = lookup(ndp);
- if (error) {
+ if (error != 0) {
vrele(ndp->ni_rootdir);
namei_cleanup_cnp(cnp);
SDT_PROBE(vfs, namei, lookup, return, error, NULL, 0,
@@ -330,7 +331,7 @@ namei(struct nameidata *ndp)
if ((cnp->cn_flags & NOMACCHECK) == 0) {
error = mac_vnode_check_readlink(td->td_ucred,
ndp->ni_vp);
- if (error)
+ if (error != 0)
break;
}
#endif
@@ -348,7 +349,7 @@ namei(struct nameidata *ndp)
auio.uio_td = td;
auio.uio_resid = MAXPATHLEN;
error = VOP_READLINK(ndp->ni_vp, &auio, cnp->cn_cred);
- if (error) {
+ if (error != 0) {
if (ndp->ni_pathlen > 1)
uma_zfree(namei_zone, cp);
break;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
