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

[fedora-cvs-commits at redhat.com]

Author: davej

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

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


linux-2.6-kill-blk_attempt_merge.patch:
 block/ll_rw_blk.c      |   24 ------------------------
 drivers/ide/ide-cd.c   |    2 --
 include/linux/blkdev.h |    1 -
 3 files changed, 27 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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-kill-blk_attempt_merge.patch	9 Jan 2006 16:23:52 -0000	1.1.2.1
+++ linux-2.6-kill-blk_attempt_merge.patch	9 Jan 2006 16:32:46 -0000	1.1.2.2
@@ -46,11 +46,9 @@
 
 Signed-off-by: Jens Axboe <axboe at suse.de>
 
-diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
-index 8e13645..c130519 100644
---- a/block/ll_rw_blk.c
-+++ b/block/ll_rw_blk.c
-@@ -2748,30 +2748,6 @@ static inline int attempt_front_merge(re
+--- linux-2.6.15/block/ll_rw_blk.c~	2006-01-09 11:30:20.000000000 -0500
++++ linux-2.6.15/block/ll_rw_blk.c	2006-01-09 11:30:43.000000000 -0500
+@@ -2609,30 +2609,6 @@ static inline int attempt_front_merge(re
  	return 0;
  }
  
@@ -78,15 +76,12 @@
 -
 -EXPORT_SYMBOL(blk_attempt_remerge);
 -
- static void init_request_from_bio(struct request *req, struct bio *bio)
+ static int __make_request(request_queue_t *q, struct bio *bio)
  {
- 	req->flags |= REQ_CMD;
- 
-diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
-index d31117e..e4d55ad 100644
---- a/drivers/ide/ide-cd.c
-+++ b/drivers/ide/ide-cd.c
-@@ -1332,8 +1332,6 @@ static ide_startstop_t cdrom_start_read 
+ 	struct request *req;
+--- linux-2.6.15/drivers/ide/ide-cd.c~	2006-01-09 11:30:50.000000000 -0500
++++ linux-2.6.15/drivers/ide/ide-cd.c	2006-01-09 11:30:55.000000000 -0500
+@@ -1338,8 +1338,6 @@ static ide_startstop_t cdrom_start_read 
  	if (cdrom_read_from_buffer(drive))
  		return ide_stopped;
  
@@ -95,32 +90,13 @@
  	/* Clear the local sector buffer. */
  	info->nsectors_buffered = 0;
  
-@@ -1874,14 +1872,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
-diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index 804cc4e..02a585f 100644
---- a/include/linux/blkdev.h
-+++ b/include/linux/blkdev.h
-@@ -595,7 +595,6 @@ extern void generic_make_request(struct 
+--- linux-2.6.15/include/linux/blkdev.h~	2006-01-09 11:31:17.000000000 -0500
++++ linux-2.6.15/include/linux/blkdev.h	2006-01-09 11:31:20.000000000 -0500
+@@ -559,7 +559,6 @@ extern void register_disk(struct gendisk
+ extern void generic_make_request(struct bio *bio);
  extern void blk_put_request(struct request *);
- extern void __blk_put_request(request_queue_t *, struct request *);
- extern void blk_end_sync_rq(struct request *rq, int error);
+ extern void blk_end_sync_rq(struct request *rq);
 -extern void blk_attempt_remerge(request_queue_t *, struct request *);
  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 *);
-
-