svn commit: r187836 - head/sys/fs/cd9660

[John Baldwin]

Author: jhb
Date: Wed Jan 28 18:46:29 2009
New Revision: 187836
URL: http://svn.freebsd.org/changeset/base/187836

Log:
  Sync with ufs_vnops.c:1.245 and remove support for accessing device nodes
  in ISO 9660 filesystems.

Modified:
  head/sys/fs/cd9660/cd9660_vnops.c

Modified: head/sys/fs/cd9660/cd9660_vnops.c
==============================================================================
--- head/sys/fs/cd9660/cd9660_vnops.c	Wed Jan 28 18:39:23 2009	(r187835)
+++ head/sys/fs/cd9660/cd9660_vnops.c	Wed Jan 28 18:46:29 2009	(r187836)
@@ -168,10 +168,14 @@ cd9660_open(ap)
 		int a_fdidx;
 	} */ *ap;
 {
-	struct iso_node *ip = VTOI(ap->a_vp);
+	struct vnode *vp = ap->a_vp;
+	struct iso_node *ip = VTOI(vp);
 
-	vnode_create_vobject(ap->a_vp, ip->i_size, ap->a_td);
-	return 0;
+	if (vp->v_type == VCHR || vp->v_type == VBLK)
+		return (EOPNOTSUPP);
+
+	vnode_create_vobject(vp, ip->i_size, ap->a_td);
+	return (0);
 }