Date: Tue, 20 Apr 2010 21:33:14 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r206929 - stable/8/sys/geom/sched Message-ID: <201004202133.o3KLXEsM050637@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luigi Date: Tue Apr 20 21:33:14 2010 New Revision: 206929 URL: http://svn.freebsd.org/changeset/base/206929 Log: MFC r206551 (forgotten in previous commit): fix builds with ktr Modified: stable/8/sys/geom/sched/g_sched.c Directory Properties: stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/geom/sched/g_sched.c ============================================================================== --- stable/8/sys/geom/sched/g_sched.c Tue Apr 20 21:29:53 2010 (r206928) +++ stable/8/sys/geom/sched/g_sched.c Tue Apr 20 21:33:14 2010 (r206929) @@ -754,13 +754,6 @@ g_gsched_modevent(module_t mod, int cmd, #ifdef KTR #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 g_sched_type(struct bio *bp) @@ -777,7 +770,7 @@ static inline void 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, bp->bio_offset, bp->bio_length); } @@ -786,13 +779,13 @@ static inline void 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, bp->bio_offset, bp->bio_length); } -#else +#else /* !KTR */ #define TRC_BIO_EVENT(e, bp) -#endif +#endif /* !KTR */ /* * g_sched_done() and g_sched_start() dispatch the geom requests to
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004202133.o3KLXEsM050637>