Linus,
Here is a tested patch which fixes the build error with ll_rw_blk
in 2.3.46... Just a typo: s/back_merges_fn/back_merge_fn/
I also killed an possibly-uninit-var warning by setting
__entry = NULL, and make generic_plug_device non-static
because it is listed publicly in linux/blkdev.h.
Regards,
Jeff
Index: drivers/block/ll_rw_blk.c
===================================================================
RCS file: /g/cvslan/linux_2_3/drivers/block/ll_rw_blk.c,v
retrieving revision 1.1.1.15
diff -u -r1.1.1.15 ll_rw_blk.c
--- drivers/block/ll_rw_blk.c 2000/02/17 00:21:57 1.1.1.15
+++ drivers/block/ll_rw_blk.c 2000/02/17 03:19:36
@@ -233,7 +233,7 @@
* This is called with interrupts off and no requests on the queue.
* (and with the request spinlock aquired)
*/
-static void generic_plug_device (request_queue_t *q, kdev_t dev)
+void generic_plug_device (request_queue_t *q, kdev_t dev)
{
#ifdef CONFIG_BLK_DEV_MD
if (MAJOR(dev) == MD_MAJOR) {
@@ -253,7 +253,7 @@
INIT_LIST_HEAD(&q->queue_head);
q->elevator = ELEVATOR_DEFAULTS;
q->request_fn = rfn;
- q->back_merges_fn = ll_back_merge_fn;
+ q->back_merge_fn = ll_back_merge_fn;
q->front_merge_fn = ll_front_merge_fn;
q->merge_requests_fn = ll_merge_requests_fn;
q->make_request_fn = NULL;
@@ -679,7 +679,7 @@
int rw_ahead, max_req, max_sectors;
unsigned long flags;
int orig_latency, latency, __latency, starving, __starving, empty;
- struct list_head * entry, * __entry;
+ struct list_head * entry, * __entry = NULL;
count = bh->b_size >> 9;
sector = bh->b_rsector;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Feb 23 2000 - 21:00:17 EST