diff options
| author | Ned Bass <[email protected]> | 2015-03-24 17:22:21 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-03-27 14:45:32 -0700 |
| commit | 95a6990d9a77a56eb97b76f2880f95f0f42f4fe0 (patch) | |
| tree | ebc6a44ef158ba6ff8c08b32b0181f90f6e51984 | |
| parent | ee2ca1db28a0910770b8bd504cf021199f583047 (diff) | |
Add NULL guard in zfs_zrlock_class event class
The owner field could be NULL in some cases, so add a guard. Shorten
__entry field names to fit assignment statements in 80 columns.
Signed-off-by: Ned Bass <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Fixes #3220
| -rw-r--r-- | include/sys/trace_zrlock.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/sys/trace_zrlock.h b/include/sys/trace_zrlock.h index 3653e3e8d..8c811c2aa 100644 --- a/include/sys/trace_zrlock.h +++ b/include/sys/trace_zrlock.h @@ -42,28 +42,28 @@ DECLARE_EVENT_CLASS(zfs_zrlock_class, TP_PROTO(zrlock_t *zrl, uint32_t n), TP_ARGS(zrl, n), TP_STRUCT__entry( - __field(int32_t, zr_refcount) + __field(int32_t, refcount) #ifdef ZFS_DEBUG - __field(pid_t, zr_owner_pid) - __field(const char *, zr_caller) + __field(pid_t, owner_pid) + __field(const char *, caller) #endif __field(uint32_t, n) ), TP_fast_assign( - __entry->zr_refcount = zrl->zr_refcount; + __entry->refcount = zrl->zr_refcount; #ifdef ZFS_DEBUG - __entry->zr_owner_pid = zrl->zr_owner->pid; - __entry->zr_caller = zrl->zr_caller; + __entry->owner_pid = zrl->zr_owner ? zrl->zr_owner->pid : 0; + __entry->caller = zrl->zr_caller; #endif - __entry->n = n; + __entry->n = n; ), #ifdef ZFS_DEBUG TP_printk("zrl { refcount %d owner_pid %d caller %s } n %u", - __entry->zr_refcount, __entry->zr_owner_pid, __entry->zr_caller, + __entry->refcount, __entry->owner_pid, __entry->caller, __entry->n) #else TP_printk("zrl { refcount %d } n %u", - __entry->zr_refcount, __entry->n) + __entry->refcount, __entry->n) #endif ); |