svn commit: r310779 - head/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Thu Dec 29 16:35:49 2016
New Revision: 310779
URL: https://svnweb.freebsd.org/changeset/base/310779

Log:
  cache: sprinkle __predict_false

Modified:
  head/sys/kern/vfs_cache.c

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c   Thu Dec 29 15:09:34 2016        (r310778)
+++ head/sys/kern/vfs_cache.c   Thu Dec 29 16:35:49 2016        (r310779)
@@ -1104,7 +1104,7 @@ cache_lookup(struct vnode *dvp, struct v
        uint32_t hash;
        int error, ltype;
 
-       if (!doingcache) {
+       if (__predict_false(!doingcache)) {
                cnp->cn_flags &= ~MAKEENTRY;
                return (0);
        }
@@ -1544,13 +1544,13 @@ cache_enter_time(struct vnode *dvp, stru
        VNASSERT(dvp == NULL || (dvp->v_iflag & VI_DOOMED) == 0, dvp,
            ("cache_enter: Doomed vnode used as src"));
 
-       if (!doingcache)
+       if (__predict_false(!doingcache))
                return;
 
        /*
         * Avoid blowout in namecache entries.
         */
-       if (numcache >= desiredvnodes * ncsizefactor)
+       if (__predict_false(numcache >= desiredvnodes * ncsizefactor))
                return;
 
        cache_celockstate_init(&cel);
@@ -2054,9 +2054,9 @@ kern___getcwd(struct thread *td, char *b
        struct vnode *cdir, *rdir;
        int error;
 
-       if (disablecwd)
+       if (__predict_false(disablecwd))
                return (ENODEV);
-       if (buflen < 2)
+       if (__predict_false(buflen < 2))
                return (EINVAL);
        if (buflen > path_max)
                buflen = path_max;
@@ -2107,9 +2107,9 @@ vn_fullpath(struct thread *td, struct vn
        struct vnode *rdir;
        int error;
 
-       if (disablefullpath)
+       if (__predict_false(disablefullpath))
                return (ENODEV);
-       if (vn == NULL)
+       if (__predict_false(vn == NULL))
                return (EINVAL);
 
        buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
@@ -2141,9 +2141,9 @@ vn_fullpath_global(struct thread *td, st
        char *buf;
        int error;
 
-       if (disablefullpath)
+       if (__predict_false(disablefullpath))
                return (ENODEV);
-       if (vn == NULL)
+       if (__predict_false(vn == NULL))
                return (EINVAL);
        buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
        error = vn_fullpath1(td, vn, rootvnode, buf, retbuf, MAXPATHLEN);
@@ -2407,7 +2407,7 @@ vn_path_to_global_path(struct thread *td
        ASSERT_VOP_ELOCKED(vp, __func__);
 
        /* Return ENODEV if sysctl debug.disablefullpath==1 */
-       if (disablefullpath)
+       if (__predict_false(disablefullpath))
                return (ENODEV);
 
        /* Construct global filesystem path from vp. */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"