From owner-svn-src-head@FreeBSD.ORG  Wed Jan 28 18:46:29 2009
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 64DD81065881;
	Wed, 28 Jan 2009 18:46:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5441E8FC1A;
	Wed, 28 Jan 2009 18:46:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SIkTHw029043;
	Wed, 28 Jan 2009 18:46:29 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0SIkT9e029042;
	Wed, 28 Jan 2009 18:46:29 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200901281846.n0SIkT9e029042@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 28 Jan 2009 18:46:29 +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: r187836 - head/sys/fs/cd9660
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, 28 Jan 2009 18:46:29 -0000

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);
 }