summaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-13 23:20:16 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-13 23:20:16 -0500
commit85d6162d6cea9220e483989817eac0cebc03070e (patch)
tree275f1594f1ab7a2e033c4df1af660f5695bcf060 /include/linux/blkdev.h
parentc9d39130123238ac18478a42e25cb7996eacfcc0 (diff)
parent4ba529a8a39e15688b6a3d31b11930d1f8a1edad (diff)
Merge branch 'master'
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 025a7f084dbd..a33a31e71bbc 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -406,6 +406,7 @@ struct request_queue
atomic_t refcnt;
+ unsigned int nr_sorted;
unsigned int in_flight;
/*
@@ -631,6 +632,7 @@ static inline void elv_dispatch_add_tail(struct request_queue *q,
{
if (q->last_merge == rq)
q->last_merge = NULL;
+ q->nr_sorted--;
q->end_sector = rq_end_sector(rq);
q->boundary_rq = rq;