From owner-svn-src-projects@FreeBSD.ORG Wed Aug 11 04:56:00 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02367106566C; Wed, 11 Aug 2010 04:56:00 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E6FB08FC1D; Wed, 11 Aug 2010 04:55:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7B4txKS042620; Wed, 11 Aug 2010 04:55:59 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7B4txR9042619; Wed, 11 Aug 2010 04:55:59 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201008110455.o7B4txR9042619@svn.freebsd.org> From: Jeff Roberson Date: Wed, 11 Aug 2010 04:55:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211161 - projects/suj/6/sys/ufs/ufs X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2010 04:56:00 -0000 Author: jeff Date: Wed Aug 11 04:55:58 2010 New Revision: 211161 URL: http://svn.freebsd.org/changeset/base/211161 Log: - Somehow my last commit omitted this change. Reported by: Mark Saad Modified: projects/suj/6/sys/ufs/ufs/ufs_lookup.c Modified: projects/suj/6/sys/ufs/ufs/ufs_lookup.c ============================================================================== --- projects/suj/6/sys/ufs/ufs/ufs_lookup.c Wed Aug 11 03:08:03 2010 (r211160) +++ projects/suj/6/sys/ufs/ufs/ufs_lookup.c Wed Aug 11 04:55:58 2010 (r211161) @@ -591,7 +591,7 @@ found: */ pdp = vdp; if (flags & ISDOTDOT) { - saved_ino = dp->i_ino; + saved_ino = ino; VOP_UNLOCK(pdp, 0, td); /* race to get the inode */ error = VFS_VGET(pdp->v_mount, saved_ino, cnp->cn_lkflags, &tdp); @@ -599,11 +599,11 @@ found: if (error) return (error); *vpp = tdp; - } else if (dp->i_number == dp->i_ino) { + } else if (dp->i_number == ino) { VREF(vdp); /* we want ourself, ie "." */ *vpp = vdp; } else { - error = VFS_VGET(pdp->v_mount, dp->i_ino, + error = VFS_VGET(pdp->v_mount, ino, cnp->cn_lkflags, &tdp); if (error) return (error);