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
bsg: setting rq->bio to NULL
[safe/jmp/linux-2.6]
/
block
/
blk.h
diff --git
a/block/blk.h
b/block/blk.h
index
0dce92c
..
79c85f7
100644
(file)
--- a/
block/blk.h
+++ b/
block/blk.h
@@
-70,6
+70,10
@@
void blk_queue_congestion_threshold(struct request_queue *q);
int blk_dev_init(void);
int blk_dev_init(void);
+void elv_quiesce_start(struct request_queue *q);
+void elv_quiesce_end(struct request_queue *q);
+
+
/*
* Return the threshold (number of used requests) at which the queue is
* considered to be congested. It include a little hysteresis to keep the
/*
* Return the threshold (number of used requests) at which the queue is
* considered to be congested. It include a little hysteresis to keep the
@@
-102,18
+106,15
@@
static inline int blk_cpu_to_group(int cpu)
const struct cpumask *mask = cpu_coregroup_mask(cpu);
return cpumask_first(mask);
#elif defined(CONFIG_SCHED_SMT)
const struct cpumask *mask = cpu_coregroup_mask(cpu);
return cpumask_first(mask);
#elif defined(CONFIG_SCHED_SMT)
- return
first_cpu(per_cpu(cpu_sibling_map,
cpu));
+ return
cpumask_first(topology_thread_cpumask(
cpu));
#else
return cpu;
#endif
}
#else
return cpu;
#endif
}
-static inline int blk_do_io_stat(struct request
_queue *
q)
+static inline int blk_do_io_stat(struct request
*r
q)
{
{
- if (q)
- return blk_queue_io_stat(q);
-
- return 0;
+ return rq->rq_disk && blk_rq_io_stat(rq);
}
#endif
}
#endif