d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r206551 (forgotten in previous commit): fix builds with ktr

Browse Source
This commit is contained in:
Luigi Rizzo 2010-04-20 21:33:14 +00:00
parent 4b1a8666b9
commit 509fc65cb0
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/geom/sched/g_sched.c
View File

@ -754,13 +754,6 @@ g_gsched_modevent(module_t mod, int cmd, void *arg)
#ifdef KTR #ifdef KTR
#define TRC_BIO_EVENT(e, bp) g_sched_trace_bio_ ## e (bp) #define TRC_BIO_EVENT(e, bp) g_sched_trace_bio_ ## e (bp)
static inline int
g_sched_issuer_pid(struct bio *bp)
{
struct thread *thread = g_sched_issuer(bp);
return (thread->td_tid);
}
static inline char static inline char
g_sched_type(struct bio *bp) g_sched_type(struct bio *bp)
@ -777,7 +770,7 @@ static inline void
g_sched_trace_bio_START(struct bio *bp) g_sched_trace_bio_START(struct bio *bp)
{ {
CTR5(KTR_GSCHED, "S %d %c %lu/%lu %lu", g_sched_issuer_pid(bp), CTR5(KTR_GSCHED, "S %lu %c %lu/%lu %lu", g_sched_classify(bp),
g_sched_type(bp), bp->bio_offset / ULONG_MAX, g_sched_type(bp), bp->bio_offset / ULONG_MAX,
bp->bio_offset, bp->bio_length); bp->bio_offset, bp->bio_length);
} }
@ -786,13 +779,13 @@ static inline void
g_sched_trace_bio_DONE(struct bio *bp) g_sched_trace_bio_DONE(struct bio *bp)
{ {
CTR5(KTR_GSCHED, "D %d %c %lu/%lu %lu", g_sched_issuer_pid(bp), CTR5(KTR_GSCHED, "D %lu %c %lu/%lu %lu", g_sched_classify(bp),
g_sched_type(bp), bp->bio_offset / ULONG_MAX, g_sched_type(bp), bp->bio_offset / ULONG_MAX,
bp->bio_offset, bp->bio_length); bp->bio_offset, bp->bio_length);
} }
#else #else /* !KTR */
#define TRC_BIO_EVENT(e, bp) #define TRC_BIO_EVENT(e, bp)
#endif #endif /* !KTR */
/* /*
* g_sched_done() and g_sched_start() dispatch the geom requests to * g_sched_done() and g_sched_start() dispatch the geom requests to