Release old elevator on change elevator

We should release old elevator when change to use a new one. Signed-off-by: Zhao Lei <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
chewitt · Nov 18, 2008 · 68aee07 · 68aee07
1 parent 561ec68
commit 68aee07
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
@@ -338,12 +338,18 @@ static void do_blkif_request(struct request_queue *rq)
 static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
 {
 	struct request_queue *rq;
+	elevator_t *old_e;
 
 	rq = blk_init_queue(do_blkif_request, &blkif_io_lock);
 	if (rq == NULL)
 		return -1;
 
-	elevator_init(rq, "noop");
+	old_e = rq->elevator;
+	if (IS_ERR_VALUE(elevator_init(rq, "noop")))
+		printk(KERN_WARNING
+			"blkfront: Switch elevator failed, use default\n");
+	else
+		elevator_exit(old_e);
 
 	/* Hard sector size and max sectors impersonate the equiv. hardware. */
 	blk_queue_hardsect_size(rq, sector_size);