Revert "block: fix accounting bug on cross partition merges"
This reverts commit 7681bfeecc
.
Conflicts:
include/linux/genhd.h
It has numerous issues with the cleanup path and non-elevator
devices. Revert it for now so we can come up with a clean
version without rushing things.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
@@ -122,8 +122,6 @@ extern void elv_completed_request(struct request_queue *, struct request *);
|
||||
extern int elv_set_request(struct request_queue *, struct request *, gfp_t);
|
||||
extern void elv_put_request(struct request_queue *, struct request *);
|
||||
extern void elv_drain_elevator(struct request_queue *);
|
||||
extern void elv_quiesce_start(struct request_queue *);
|
||||
extern void elv_quiesce_end(struct request_queue *);
|
||||
|
||||
/*
|
||||
* io scheduler registration
|
||||
|
Reference in New Issue
Block a user