summaryrefslogtreecommitdiffstats
path: root/include/linux/elevator.h
diff options
context:
space:
mode:
authorJerome Marchand <jmarchan@redhat.com>2009-03-27 10:31:51 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-04-07 08:12:38 +0200
commit26308eab69aa193f7b3fb50764a64ae14544a39b (patch)
tree758f6100395a23228d042c3a9d6f7dc1922d7530 /include/linux/elevator.h
parent6c7e8cee6a9128eeb7f83c3ad1cb243f77f5cb16 (diff)
downloadlinux-stable-26308eab69aa193f7b3fb50764a64ae14544a39b.tar.gz
linux-stable-26308eab69aa193f7b3fb50764a64ae14544a39b.tar.bz2
linux-stable-26308eab69aa193f7b3fb50764a64ae14544a39b.zip
block: fix inconsistency in I/O stat accounting code
This forces in_flight to be zero when turning off or on the I/O stat accounting and stops updating I/O stats in attempt_merge() when accounting is turned off. Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux/elevator.h')
-rw-r--r--include/linux/elevator.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 7a204256b155..c59b769f62b0 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -116,6 +116,7 @@ extern void elv_abort_queue(struct request_queue *);
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 *);
/*
* io scheduler registration