summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-09 11:45:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-09 11:45:21 -0800
commitaceb91cd351bc3a19a783c901fe8a8070d5f6fa9 (patch)
treea0863e940a77ae10d3c8b391488e29a8245b31be /kernel
parentae8eed2d0906bf0d8eb0c2a4651676a41d361297 (diff)
parentb8cf0e0e552ca48e9a00f518aeb4f5e03984022b (diff)
downloadblackbird-op-linux-aceb91cd351bc3a19a783c901fe8a8070d5f6fa9.tar.gz
blackbird-op-linux-aceb91cd351bc3a19a783c901fe8a8070d5f6fa9.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: cdrom: support devices that have check_events but not media_changed cfq-iosched: Don't wait if queue already has requests. blkio-throttle: Avoid calling blkiocg_lookup_group() for root group cfq: rename a function to give it more appropriate name cciss: make cciss_revalidate not loop through CISS_MAX_LUNS volumes unnecessarily. drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y loop: queue_lock NULL pointer derefence in blk_throtl_exit drivers/block/Makefile: replace the use of <module>-objs with <module>-y blktrace: Don't output messages if NOTIFY isn't set.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/blktrace.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 153562d0b93c..d95721f33702 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -138,6 +138,13 @@ void __trace_note_message(struct blk_trace *bt, const char *fmt, ...)
!blk_tracer_enabled))
return;
+ /*
+ * If the BLK_TC_NOTIFY action mask isn't set, don't send any note
+ * message to the trace.
+ */
+ if (!(bt->act_mask & BLK_TC_NOTIFY))
+ return;
+
local_irq_save(flags);
buf = per_cpu_ptr(bt->msg_data, smp_processor_id());
va_start(args, fmt);
OpenPOWER on IntegriCloud