From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 26 17:02:54 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 21366106564A;
	Fri, 26 Aug 2011 17:02:54 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 103D78FC13;
	Fri, 26 Aug 2011 17:02:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7QH2ruO063405;
	Fri, 26 Aug 2011 17:02:53 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7QH2riL063402;
	Fri, 26 Aug 2011 17:02:53 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201108261702.p7QH2riL063402@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Fri, 26 Aug 2011 17:02:53 +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: r225193 - in projects/ino64/sys: fs/unionfs kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Aug 2011 17:02:54 -0000

Author: mdf
Date: Fri Aug 26 17:02:53 2011
New Revision: 225193
URL: http://svn.freebsd.org/changeset/base/225193

Log:
  Skip empty directory entries (entries with zero inode number) during
  name lookup.
  
  GSoC r222838.
  Code by Gleb Kurtsou.

Modified:
  projects/ino64/sys/fs/unionfs/union_subr.c
  projects/ino64/sys/kern/vfs_default.c

Modified: projects/ino64/sys/fs/unionfs/union_subr.c
==============================================================================
--- projects/ino64/sys/fs/unionfs/union_subr.c	Fri Aug 26 16:49:17 2011	(r225192)
+++ projects/ino64/sys/fs/unionfs/union_subr.c	Fri Aug 26 17:02:53 2011	(r225193)
@@ -1177,7 +1177,7 @@ unionfs_check_rmdir(struct vnode *vp, st
 		edp = (struct dirent*)&buf[sizeof(buf) - uio.uio_resid];
 		for (dp = (struct dirent*)buf; !error && dp < edp;
 		     dp = (struct dirent*)((caddr_t)dp + dp->d_reclen)) {
-			if (dp->d_type == DT_WHT ||
+			if (dp->d_type == DT_WHT || dp->d_fileno == 0 ||
 			    (dp->d_namlen == 1 && dp->d_name[0] == '.') ||
 			    (dp->d_namlen == 2 && !bcmp(dp->d_name, "..", 2)))
 				continue;

Modified: projects/ino64/sys/kern/vfs_default.c
==============================================================================
--- projects/ino64/sys/kern/vfs_default.c	Fri Aug 26 16:49:17 2011	(r225192)
+++ projects/ino64/sys/kern/vfs_default.c	Fri Aug 26 17:02:53 2011	(r225193)
@@ -339,8 +339,8 @@ dirent_exists(struct vnode *vp, const ch
 		if (error)
 			goto out;
 
-		if ((dp->d_type != DT_WHT) &&
-		    !strcmp(dp->d_name, dirname)) {
+		if (dp->d_type != DT_WHT && dp->d_fileno != 0 &&
+		    strcmp(dp->d_name, dirname) == 0) {
 			found = 1;
 			goto out;
 		}