From owner-svn-src-head@FreeBSD.ORG  Tue Nov 18 23:15:18 2008
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 4B11C1065741;
	Tue, 18 Nov 2008 23:15:18 +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 369398FC1F;
	Tue, 18 Nov 2008 23:15:18 +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 mAINFIA9095704;
	Tue, 18 Nov 2008 23:15:18 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAINFIoi095703;
	Tue, 18 Nov 2008 23:15:18 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200811182315.mAINFIoi095703@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 18 Nov 2008 23:15:18 +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: r185069 - 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: Tue, 18 Nov 2008 23:15:18 -0000

Author: jhb
Date: Tue Nov 18 23:15:17 2008
New Revision: 185069
URL: http://svn.freebsd.org/changeset/base/185069

Log:
  Remove copy/paste code from UFS to handle sparse blocks.  While Rock
  Ridge does support sparse files, the cd9660 code does not currently
  support them.

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

Modified: head/sys/fs/cd9660/cd9660_vnops.c
==============================================================================
--- head/sys/fs/cd9660/cd9660_vnops.c	Tue Nov 18 23:13:40 2008	(r185068)
+++ head/sys/fs/cd9660/cd9660_vnops.c	Tue Nov 18 23:15:17 2008	(r185069)
@@ -743,12 +743,6 @@ cd9660_strategy(ap)
 	if (bp->b_blkno == bp->b_lblkno) {
 		bp->b_blkno = (ip->iso_start + bp->b_lblkno) <<
 		    (ip->i_mnt->im_bshift - DEV_BSHIFT);
-		if ((long)bp->b_blkno == -1)	/* XXX: cut&paste junk ? */
-			clrbuf(bp);
-	}
-	if ((long)bp->b_blkno == -1) {	/* XXX: cut&paste junk ? */
-		bufdone(bp);
-		return (0);
 	}
 	bp->b_iooffset = dbtob(bp->b_blkno);
 	bo = ip->i_mnt->im_bo;