rpms/kernel/devel linux-2.6-kill-blk_attempt_merge.patch, 1.1.2.2, 1.1.2.3

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19277

Modified Files:
      Tag: private-fc5-test2-branch
	linux-2.6-kill-blk_attempt_merge.patch 
Log Message:
missing hunk


linux-2.6-kill-blk_attempt_merge.patch:
 block/ll_rw_blk.c      |   24 ------------------------
 drivers/ide/ide-cd.c   |   10 ----------
 include/linux/blkdev.h |    1 -
 3 files changed, 35 deletions(-)

Index: linux-2.6-kill-blk_attempt_merge.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-kill-blk_attempt_merge.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- linux-2.6-kill-blk_attempt_merge.patch	9 Jan 2006 16:32:46 -0000	1.1.2.2
+++ linux-2.6-kill-blk_attempt_merge.patch	9 Jan 2006 16:44:36 -0000	1.1.2.3
@@ -100,3 +100,20 @@
  extern struct request *blk_get_request(request_queue_t *, int, gfp_t);
  extern void blk_insert_request(request_queue_t *, struct request *, int, void *);
  extern void blk_requeue_request(request_queue_t *, struct request *);
+--- linux-2.6.15/drivers/ide/ide-cd.c~	2006-01-09 11:44:09.000000000 -0500
++++ linux-2.6.15/drivers/ide/ide-cd.c	2006-01-09 11:44:18.000000000 -0500
+@@ -1878,14 +1878,6 @@ static ide_startstop_t cdrom_start_write
+ 		return ide_stopped;
+ 	}
+ 
+-	/*
+-	 * for dvd-ram and such media, it's a really big deal to get
+-	 * big writes all the time. so scour the queue and attempt to
+-	 * remerge requests, often the plugging will not have had time
+-	 * to do this properly
+-	 */
+-	blk_attempt_remerge(drive->queue, rq);
+-
+ 	info->nsectors_buffered = 0;
+ 
+ 	/* use dma, if possible. we don't need to check more, since we