From owner-svn-src-head@FreeBSD.ORG  Wed May 16 10:44:10 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 05C3A106564A;
	Wed, 16 May 2012 10:44:10 +0000 (UTC)
	(envelope-from gleb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E45808FC0A;
	Wed, 16 May 2012 10:44:09 +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 q4GAi9Cj038844;
	Wed, 16 May 2012 10:44:09 GMT (envelope-from gleb@svn.freebsd.org)
Received: (from gleb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4GAi91b038841;
	Wed, 16 May 2012 10:44:09 GMT (envelope-from gleb@svn.freebsd.org)
Message-Id: <201205161044.q4GAi91b038841@svn.freebsd.org>
From: Gleb Kurtsou <gleb@FreeBSD.org>
Date: Wed, 16 May 2012 10:44:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235503 - in head/sys: fs/unionfs kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 May 2012 10:44:10 -0000

Author: gleb
Date: Wed May 16 10:44:09 2012
New Revision: 235503
URL: http://svn.freebsd.org/changeset/base/235503

Log:
  Skip directory entries with zero inode number during traversal.
  
  Entries with zero inode number are considered placeholders by libc and
  UFS.  Fix remaining uses of VOP_READDIR in kernel: vop_stdvptocnp,
  unionfs.
  
  Sponsored by:	Google Summer of Code 2011

Modified:
  head/sys/fs/unionfs/union_subr.c
  head/sys/kern/vfs_default.c

Modified: head/sys/fs/unionfs/union_subr.c
==============================================================================
--- head/sys/fs/unionfs/union_subr.c	Wed May 16 09:03:29 2012	(r235502)
+++ head/sys/fs/unionfs/union_subr.c	Wed May 16 10:44:09 2012	(r235503)
@@ -1184,7 +1184,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: head/sys/kern/vfs_default.c
==============================================================================
--- head/sys/kern/vfs_default.c	Wed May 16 09:03:29 2012	(r235502)
+++ head/sys/kern/vfs_default.c	Wed May 16 10:44:09 2012	(r235503)
@@ -343,8 +343,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;
 		}