From owner-svn-src-all@FreeBSD.ORG Wed Apr 15 16:36:13 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4D8C1065673; Wed, 15 Apr 2009 16:36:13 +0000 (UTC) (envelope-from kan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D251F8FC31; Wed, 15 Apr 2009 16:36:13 +0000 (UTC) (envelope-from kan@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3FGaDVK048046; Wed, 15 Apr 2009 16:36:13 GMT (envelope-from kan@svn.freebsd.org) Received: (from kan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3FGaDF2048045; Wed, 15 Apr 2009 16:36:13 GMT (envelope-from kan@svn.freebsd.org) Message-Id: <200904151636.n3FGaDF2048045@svn.freebsd.org> From: Alexander Kabaev Date: Wed, 15 Apr 2009 16:36:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191107 - in releng/7.2/sys: . contrib/pf dev/ath/ath_hal dev/cxgb kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 16:36:14 -0000 Author: kan Date: Wed Apr 15 16:36:13 2009 New Revision: 191107 URL: http://svn.freebsd.org/changeset/base/191107 Log: MFC r191081-191082: Properly handle negative cache enries found through dotdot lookups. Submitted by: tegge Approved by: re(kib) _M sys M sys/kern/vfs_cache.c _M sys/dev/cxgb _M sys/dev/ath/ath_hal _M sys/contrib/pf Modified: releng/7.2/sys/ (props changed) releng/7.2/sys/contrib/pf/ (props changed) releng/7.2/sys/dev/ath/ath_hal/ (props changed) releng/7.2/sys/dev/cxgb/ (props changed) releng/7.2/sys/kern/vfs_cache.c Modified: releng/7.2/sys/kern/vfs_cache.c ============================================================================== --- releng/7.2/sys/kern/vfs_cache.c Wed Apr 15 16:05:25 2009 (r191106) +++ releng/7.2/sys/kern/vfs_cache.c Wed Apr 15 16:36:13 2009 (r191107) @@ -370,6 +370,11 @@ retry: *vpp = dvp->v_cache_dd->nc_vp; else *vpp = dvp->v_cache_dd->nc_dvp; + /* Return failure if negative entry was found. */ + if (*vpp == NULL) { + ncp = dvp->v_cache_dd; + goto negative_success; + } CTR3(KTR_VFS, "cache_lookup(%p, %s) found %p via ..", dvp, cnp->cn_nameptr, *vpp); goto success; @@ -416,6 +421,7 @@ retry: goto success; } +negative_success: /* We found a negative match, and want to create it, so purge */ if (cnp->cn_nameiop == CREATE) { numnegzaps++;