From: Peter Osterlund <petero2@telia.com>
Simplified the code in the pktcdvd driver that ensures that write requests
are not larger than the packet size. This also limits the read request
size, but that doesn't seem cause any measurable overhead, so it's better
to keep the code simple.
Signed-off-by: Peter Osterlund <petero2@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/block/pktcdvd.c | 45 ++++++----------------------------------
25-akpm/include/linux/pktcdvd.h | 2 -
2 files changed, 7 insertions(+), 40 deletions(-)
diff -puN drivers/block/pktcdvd.c~simplified-request-size-handling-in-cdrw-packet-writing drivers/block/pktcdvd.c
--- 25/drivers/block/pktcdvd.c~simplified-request-size-handling-in-cdrw-packet-writing 2004-08-15 17:37:02.634075144 -0700
+++ 25-akpm/drivers/block/pktcdvd.c 2004-08-15 17:37:02.640074232 -0700
@@ -84,25 +84,6 @@ static struct pktcdvd_device *pkt_find_d
return NULL;
}
-/*
- * The underlying block device is not allowed to merge write requests. Some
- * CDRW drives can not handle writes larger than one packet, even if the size
- * is a multiple of the packet size.
- */
-static int pkt_lowlevel_elv_merge_fn(request_queue_t *q, struct request **req, struct bio *bio)
-{
- struct pktcdvd_device *pd = pkt_find_dev(q);
- BUG_ON(!pd);
-
- if (bio_data_dir(bio) == WRITE)
- return ELEVATOR_NO_MERGE;
-
- if (pd->cdrw.elv_merge_fn)
- return pd->cdrw.elv_merge_fn(q, req, bio);
-
- return ELEVATOR_NO_MERGE;
-}
-
static void pkt_lowlevel_elv_completed_req_fn(request_queue_t *q, struct request *req)
{
struct pktcdvd_device *pd = pkt_find_dev(q);
@@ -118,17 +99,6 @@ static void pkt_lowlevel_elv_completed_r
pd->cdrw.elv_completed_req_fn(q, req);
}
-static int pkt_lowlevel_merge_requests_fn(request_queue_t *q, struct request *rq, struct request *next)
-{
- struct pktcdvd_device *pd = pkt_find_dev(q);
- BUG_ON(!pd);
-
- if (rq_data_dir(rq) == WRITE)
- return 0;
-
- return pd->cdrw.merge_requests_fn(q, rq, next);
-}
-
static void pkt_bio_init(struct bio *bio)
{
bio->bi_next = NULL;
@@ -1934,17 +1904,20 @@ static int pkt_open_dev(struct pktcdvd_d
}
}
spin_lock_irq(q->queue_lock);
- pd->cdrw.elv_merge_fn = q->elevator.elevator_merge_fn;
pd->cdrw.elv_completed_req_fn = q->elevator.elevator_completed_req_fn;
- pd->cdrw.merge_requests_fn = q->merge_requests_fn;
- q->elevator.elevator_merge_fn = pkt_lowlevel_elv_merge_fn;
q->elevator.elevator_completed_req_fn = pkt_lowlevel_elv_completed_req_fn;
- q->merge_requests_fn = pkt_lowlevel_merge_requests_fn;
spin_unlock_irq(q->queue_lock);
if (write) {
if ((ret = pkt_open_write(pd)))
goto restore_queue;
+ /*
+ * Some CDRW drives can not handle writes larger than one packet,
+ * even if the size is a multiple of the packet size.
+ */
+ spin_lock_irq(q->queue_lock);
+ blk_queue_max_sectors(q, pd->settings.size);
+ spin_unlock_irq(q->queue_lock);
set_bit(PACKET_WRITABLE, &pd->flags);
} else {
pkt_set_speed(pd, 0xffff, 0xffff);
@@ -1961,9 +1934,7 @@ static int pkt_open_dev(struct pktcdvd_d
restore_queue:
spin_lock_irq(q->queue_lock);
- q->elevator.elevator_merge_fn = pd->cdrw.elv_merge_fn;
q->elevator.elevator_completed_req_fn = pd->cdrw.elv_completed_req_fn;
- q->merge_requests_fn = pd->cdrw.merge_requests_fn;
spin_unlock_irq(q->queue_lock);
out_putdev:
blkdev_put(pd->bdev);
@@ -1987,9 +1958,7 @@ static void pkt_release_dev(struct pktcd
q = bdev_get_queue(pd->bdev);
pkt_set_speed(pd, 0xffff, 0xffff);
spin_lock_irq(q->queue_lock);
- q->elevator.elevator_merge_fn = pd->cdrw.elv_merge_fn;
q->elevator.elevator_completed_req_fn = pd->cdrw.elv_completed_req_fn;
- q->merge_requests_fn = pd->cdrw.merge_requests_fn;
spin_unlock_irq(q->queue_lock);
blkdev_put(pd->bdev);
}
diff -puN include/linux/pktcdvd.h~simplified-request-size-handling-in-cdrw-packet-writing include/linux/pktcdvd.h
--- 25/include/linux/pktcdvd.h~simplified-request-size-handling-in-cdrw-packet-writing 2004-08-15 17:37:02.635074992 -0700
+++ 25-akpm/include/linux/pktcdvd.h 2004-08-15 17:37:02.641074080 -0700
@@ -139,9 +139,7 @@ struct packet_cdrw
struct list_head pkt_active_list;
spinlock_t active_list_lock; /* Serialize access to pkt_active_list */
struct task_struct *thread;
- elevator_merge_fn *elv_merge_fn;
elevator_completed_req_fn *elv_completed_req_fn;
- merge_requests_fn *merge_requests_fn;
};
/*
_