Merge branch 'akpm' (patches from Andrew)
Merge second patch-bomb from Andrew Morton: - most of the rest of MM - procfs - lib/ updates - printk updates - bitops infrastructure tweaks - checkpatch updates - nilfs2 update - signals - various other misc bits: coredump, seqfile, kexec, pidns, zlib, ipc, dma-debug, dma-mapping, ... * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (102 commits) ipc,msg: drop dst nil validation in copy_msg include/linux/zutil.h: fix usage example of zlib_adler32() panic: release stale console lock to always get the logbuf printed out dma-debug: check nents in dma_sync_sg* dma-mapping: tidy up dma_parms default handling pidns: fix set/getpriority and ioprio_set/get in PRIO_USER mode kexec: use file name as the output message prefix fs, seqfile: always allow oom killer seq_file: reuse string_escape_str() fs/seq_file: use seq_* helpers in seq_hex_dump() coredump: change zap_threads() and zap_process() to use for_each_thread() coredump: ensure all coredumping tasks have SIGNAL_GROUP_COREDUMP signal: remove jffs2_garbage_collect_thread()->allow_signal(SIGCONT) signal: introduce kernel_signal_stop() to fix jffs2_garbage_collect_thread() signal: turn dequeue_signal_lock() into kernel_dequeue_signal() signals: kill block_all_signals() and unblock_all_signals() nilfs2: fix gcc uninitialized-variable warnings in powerpc build nilfs2: fix gcc unused-but-set-variable warnings MAINTAINERS: nilfs2: add header file for tracing nilfs2: add tracepoints for analyzing reading and writing metadata files ...
This commit is contained in:
Linus Torvalds
@@ -20,7 +20,7 @@
|
||||
{(unsigned long)GFP_ATOMIC, "GFP_ATOMIC"}, \
|
||||
{(unsigned long)GFP_NOIO, "GFP_NOIO"}, \
|
||||
{(unsigned long)__GFP_HIGH, "GFP_HIGH"}, \
|
||||
{(unsigned long)__GFP_WAIT, "GFP_WAIT"}, \
|
||||
{(unsigned long)__GFP_ATOMIC, "GFP_ATOMIC"}, \
|
||||
{(unsigned long)__GFP_IO, "GFP_IO"}, \
|
||||
{(unsigned long)__GFP_COLD, "GFP_COLD"}, \
|
||||
{(unsigned long)__GFP_NOWARN, "GFP_NOWARN"}, \
|
||||
@@ -36,7 +36,8 @@
|
||||
{(unsigned long)__GFP_RECLAIMABLE, "GFP_RECLAIMABLE"}, \
|
||||
{(unsigned long)__GFP_MOVABLE, "GFP_MOVABLE"}, \
|
||||
{(unsigned long)__GFP_NOTRACK, "GFP_NOTRACK"}, \
|
||||
{(unsigned long)__GFP_NO_KSWAPD, "GFP_NO_KSWAPD"}, \
|
||||
{(unsigned long)__GFP_DIRECT_RECLAIM, "GFP_DIRECT_RECLAIM"}, \
|
||||
{(unsigned long)__GFP_KSWAPD_RECLAIM, "GFP_KSWAPD_RECLAIM"}, \
|
||||
{(unsigned long)__GFP_OTHER_NODE, "GFP_OTHER_NODE"} \
|
||||
) : "GFP_NOWAIT"
|
||||
|
||||
|
||||
224
include/trace/events/nilfs2.h
Normal file
224
include/trace/events/nilfs2.h
Normal file
@@ -0,0 +1,224 @@
|
||||
#undef TRACE_SYSTEM
|
||||
#define TRACE_SYSTEM nilfs2
|
||||
|
||||
#if !defined(_TRACE_NILFS2_H) || defined(TRACE_HEADER_MULTI_READ)
|
||||
#define _TRACE_NILFS2_H
|
||||
|
||||
#include <linux/tracepoint.h>
|
||||
|
||||
struct nilfs_sc_info;
|
||||
|
||||
#define show_collection_stage(type) \
|
||||
__print_symbolic(type, \
|
||||
{ NILFS_ST_INIT, "ST_INIT" }, \
|
||||
{ NILFS_ST_GC, "ST_GC" }, \
|
||||
{ NILFS_ST_FILE, "ST_FILE" }, \
|
||||
{ NILFS_ST_IFILE, "ST_IFILE" }, \
|
||||
{ NILFS_ST_CPFILE, "ST_CPFILE" }, \
|
||||
{ NILFS_ST_SUFILE, "ST_SUFILE" }, \
|
||||
{ NILFS_ST_DAT, "ST_DAT" }, \
|
||||
{ NILFS_ST_SR, "ST_SR" }, \
|
||||
{ NILFS_ST_DSYNC, "ST_DSYNC" }, \
|
||||
{ NILFS_ST_DONE, "ST_DONE"})
|
||||
|
||||
TRACE_EVENT(nilfs2_collection_stage_transition,
|
||||
|
||||
TP_PROTO(struct nilfs_sc_info *sci),
|
||||
|
||||
TP_ARGS(sci),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(void *, sci)
|
||||
__field(int, stage)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->sci = sci;
|
||||
__entry->stage = sci->sc_stage.scnt;
|
||||
),
|
||||
|
||||
TP_printk("sci = %p stage = %s",
|
||||
__entry->sci,
|
||||
show_collection_stage(__entry->stage))
|
||||
);
|
||||
|
||||
#ifndef TRACE_HEADER_MULTI_READ
|
||||
enum nilfs2_transaction_transition_state {
|
||||
TRACE_NILFS2_TRANSACTION_BEGIN,
|
||||
TRACE_NILFS2_TRANSACTION_COMMIT,
|
||||
TRACE_NILFS2_TRANSACTION_ABORT,
|
||||
TRACE_NILFS2_TRANSACTION_TRYLOCK,
|
||||
TRACE_NILFS2_TRANSACTION_LOCK,
|
||||
TRACE_NILFS2_TRANSACTION_UNLOCK,
|
||||
};
|
||||
#endif
|
||||
|
||||
#define show_transaction_state(type) \
|
||||
__print_symbolic(type, \
|
||||
{ TRACE_NILFS2_TRANSACTION_BEGIN, "BEGIN" }, \
|
||||
{ TRACE_NILFS2_TRANSACTION_COMMIT, "COMMIT" }, \
|
||||
{ TRACE_NILFS2_TRANSACTION_ABORT, "ABORT" }, \
|
||||
{ TRACE_NILFS2_TRANSACTION_TRYLOCK, "TRYLOCK" }, \
|
||||
{ TRACE_NILFS2_TRANSACTION_LOCK, "LOCK" }, \
|
||||
{ TRACE_NILFS2_TRANSACTION_UNLOCK, "UNLOCK" })
|
||||
|
||||
TRACE_EVENT(nilfs2_transaction_transition,
|
||||
TP_PROTO(struct super_block *sb,
|
||||
struct nilfs_transaction_info *ti,
|
||||
int count,
|
||||
unsigned int flags,
|
||||
enum nilfs2_transaction_transition_state state),
|
||||
|
||||
TP_ARGS(sb, ti, count, flags, state),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(void *, sb)
|
||||
__field(void *, ti)
|
||||
__field(int, count)
|
||||
__field(unsigned int, flags)
|
||||
__field(int, state)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->sb = sb;
|
||||
__entry->ti = ti;
|
||||
__entry->count = count;
|
||||
__entry->flags = flags;
|
||||
__entry->state = state;
|
||||
),
|
||||
|
||||
TP_printk("sb = %p ti = %p count = %d flags = %x state = %s",
|
||||
__entry->sb,
|
||||
__entry->ti,
|
||||
__entry->count,
|
||||
__entry->flags,
|
||||
show_transaction_state(__entry->state))
|
||||
);
|
||||
|
||||
TRACE_EVENT(nilfs2_segment_usage_check,
|
||||
TP_PROTO(struct inode *sufile,
|
||||
__u64 segnum,
|
||||
unsigned long cnt),
|
||||
|
||||
TP_ARGS(sufile, segnum, cnt),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(struct inode *, sufile)
|
||||
__field(__u64, segnum)
|
||||
__field(unsigned long, cnt)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->sufile = sufile;
|
||||
__entry->segnum = segnum;
|
||||
__entry->cnt = cnt;
|
||||
),
|
||||
|
||||
TP_printk("sufile = %p segnum = %llu cnt = %lu",
|
||||
__entry->sufile,
|
||||
__entry->segnum,
|
||||
__entry->cnt)
|
||||
);
|
||||
|
||||
TRACE_EVENT(nilfs2_segment_usage_allocated,
|
||||
TP_PROTO(struct inode *sufile,
|
||||
__u64 segnum),
|
||||
|
||||
TP_ARGS(sufile, segnum),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(struct inode *, sufile)
|
||||
__field(__u64, segnum)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->sufile = sufile;
|
||||
__entry->segnum = segnum;
|
||||
),
|
||||
|
||||
TP_printk("sufile = %p segnum = %llu",
|
||||
__entry->sufile,
|
||||
__entry->segnum)
|
||||
);
|
||||
|
||||
TRACE_EVENT(nilfs2_segment_usage_freed,
|
||||
TP_PROTO(struct inode *sufile,
|
||||
__u64 segnum),
|
||||
|
||||
TP_ARGS(sufile, segnum),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(struct inode *, sufile)
|
||||
__field(__u64, segnum)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->sufile = sufile;
|
||||
__entry->segnum = segnum;
|
||||
),
|
||||
|
||||
TP_printk("sufile = %p segnum = %llu",
|
||||
__entry->sufile,
|
||||
__entry->segnum)
|
||||
);
|
||||
|
||||
TRACE_EVENT(nilfs2_mdt_insert_new_block,
|
||||
TP_PROTO(struct inode *inode,
|
||||
unsigned long ino,
|
||||
unsigned long block),
|
||||
|
||||
TP_ARGS(inode, ino, block),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(struct inode *, inode)
|
||||
__field(unsigned long, ino)
|
||||
__field(unsigned long, block)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->inode = inode;
|
||||
__entry->ino = ino;
|
||||
__entry->block = block;
|
||||
),
|
||||
|
||||
TP_printk("inode = %p ino = %lu block = %lu",
|
||||
__entry->inode,
|
||||
__entry->ino,
|
||||
__entry->block)
|
||||
);
|
||||
|
||||
TRACE_EVENT(nilfs2_mdt_submit_block,
|
||||
TP_PROTO(struct inode *inode,
|
||||
unsigned long ino,
|
||||
unsigned long blkoff,
|
||||
int mode),
|
||||
|
||||
TP_ARGS(inode, ino, blkoff, mode),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(struct inode *, inode)
|
||||
__field(unsigned long, ino)
|
||||
__field(unsigned long, blkoff)
|
||||
__field(int, mode)
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->inode = inode;
|
||||
__entry->ino = ino;
|
||||
__entry->blkoff = blkoff;
|
||||
__entry->mode = mode;
|
||||
),
|
||||
|
||||
TP_printk("inode = %p ino = %lu blkoff = %lu mode = %x",
|
||||
__entry->inode,
|
||||
__entry->ino,
|
||||
__entry->blkoff,
|
||||
__entry->mode)
|
||||
);
|
||||
|
||||
#endif /* _TRACE_NILFS2_H */
|
||||
|
||||
/* This part must be outside protection */
|
||||
#undef TRACE_INCLUDE_FILE
|
||||
#define TRACE_INCLUDE_FILE nilfs2
|
||||
#include <trace/define_trace.h>
|
||||
Reference in New Issue
Block a user