From owner-svn-src-head@FreeBSD.ORG  Sat Sep 18 18:37:42 2010
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 3CD16106566B;
	Sat, 18 Sep 2010 18:37:42 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CD6E8FC08;
	Sat, 18 Sep 2010 18:37:42 +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 o8IIbgvu074323;
	Sat, 18 Sep 2010 18:37:42 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8IIbg20074321;
	Sat, 18 Sep 2010 18:37:42 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201009181837.o8IIbg20074321@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Sat, 18 Sep 2010 18:37:42 +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: r212826 - head/sys/fs/devfs
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: Sat, 18 Sep 2010 18:37:42 -0000

Author: jh
Date: Sat Sep 18 18:37:41 2010
New Revision: 212826
URL: http://svn.freebsd.org/changeset/base/212826

Log:
  - For consistency, remove "." and ".." entries from de_dlist before
    calling devfs_delete() (and thus possibly dropping dm_lock) in
    devfs_rmdir_empty().
  - Assert that we don't return doomed entries from devfs_find(). [1]
  
  Suggested by:	kib [1]
  Reviewed by:	kib

Modified:
  head/sys/fs/devfs/devfs_devs.c

Modified: head/sys/fs/devfs/devfs_devs.c
==============================================================================
--- head/sys/fs/devfs/devfs_devs.c	Sat Sep 18 16:57:05 2010	(r212825)
+++ head/sys/fs/devfs/devfs_devs.c	Sat Sep 18 18:37:41 2010	(r212826)
@@ -171,6 +171,8 @@ devfs_find(struct devfs_dirent *dd, cons
 			continue;
 		break;
 	}
+	KASSERT(de == NULL || (de->de_flags & DE_DOOMED) == 0,
+	    ("devfs_find: returning a doomed entry"));
 	return (de);
 }
 
@@ -302,6 +304,8 @@ devfs_rmdir_empty(struct devfs_mount *dm
 
 		dd = devfs_parent_dirent(de);
 		KASSERT(dd != NULL, ("devfs_rmdir_empty: NULL dd"));
+		TAILQ_REMOVE(&de->de_dlist, de_dot, de_list);
+		TAILQ_REMOVE(&de->de_dlist, de_dotdot, de_list);
 		TAILQ_REMOVE(&dd->de_dlist, de, de_list);
 		DEVFS_DE_HOLD(dd);
 		devfs_delete(dm, de, DEVFS_DEL_NORECURSE);