git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blkio: Add more debug-only per-cgroup stats
[safe/jmp/linux-2.6]
/
block
/
blk-exec.c
diff --git
a/block/blk-exec.c
b/block/blk-exec.c
index
9bceff7
..
49557e9
100644
(file)
--- a/
block/blk-exec.c
+++ b/
block/blk-exec.c
@@
-16,7
+16,7
@@
/**
* blk_end_sync_rq - executes a completion event on a request
* @rq: request to complete
/**
* blk_end_sync_rq - executes a completion event on a request
* @rq: request to complete
- * @error: end
io
status of the request
+ * @error: end
I/O
status of the request
*/
static void blk_end_sync_rq(struct request *rq, int error)
{
*/
static void blk_end_sync_rq(struct request *rq, int error)
{
@@
-41,7
+41,7
@@
static void blk_end_sync_rq(struct request *rq, int error)
* @done: I/O completion handler
*
* Description:
* @done: I/O completion handler
*
* Description:
- * Insert a fully prepared request at the back of the
io
scheduler queue
+ * Insert a fully prepared request at the back of the
I/O
scheduler queue
* for execution. Don't wait for completion.
*/
void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
* for execution. Don't wait for completion.
*/
void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
@@
-51,7
+51,6
@@
void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
rq->rq_disk = bd_disk;
int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
rq->rq_disk = bd_disk;
- rq->cmd_flags |= REQ_NOMERGE;
rq->end_io = done;
WARN_ON(irqs_disabled());
spin_lock_irq(q->queue_lock);
rq->end_io = done;
WARN_ON(irqs_disabled());
spin_lock_irq(q->queue_lock);
@@
-72,7
+71,7
@@
EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);
* @at_head: insert request at head or tail of queue
*
* Description:
* @at_head: insert request at head or tail of queue
*
* Description:
- * Insert a fully prepared request at the back of the
io
scheduler queue
+ * Insert a fully prepared request at the back of the
I/O
scheduler queue
* for execution and wait for completion.
*/
int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,
* for execution and wait for completion.
*/
int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,