svn commit: r211067 - stable/8/sys/fs/devfs

[Jaakko Heinonen]

Author: jh
Date: Sun Aug  8 12:19:49 2010
New Revision: 211067
URL: http://svn.freebsd.org/changeset/base/211067

Log:
  MFC r208717:
  
  Don't try to call cdevsw d_close() method when devfs_close() is called
  because of insmntque1() failure.

Modified:
  stable/8/sys/fs/devfs/devfs_vnops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cam/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- stable/8/sys/fs/devfs/devfs_vnops.c	Sun Aug  8 09:40:09 2010	(r211066)
+++ stable/8/sys/fs/devfs/devfs_vnops.c	Sun Aug  8 12:19:49 2010	(r211067)
@@ -459,6 +459,13 @@ devfs_close(struct vop_close_args *ap)
 	int vp_locked, error;
 
 	/*
+	 * XXX: Don't call d_close() if we were called because of
+	 * XXX: insmntque1() failure.
+	 */
+	if (vp->v_data == NULL)
+		return (0);
+
+	/*
 	 * Hack: a tty device that is a controlling terminal
 	 * has a reference from the session structure.
 	 * We cannot easily tell that a character device is