From 26826317867313b56fb91963a8aa1bee96d5ae57 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Wed, 27 Oct 2010 21:27:12 -0400 Subject: [PATCH] --- yaml --- r: 218854 b: refs/heads/master c: b853fd364810a241050778124842a8c415c72a69 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/events/ext4.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34ee9a00896b..78a5401d32d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39e3ac2599a5f9aba499b5f8af809108e70a6163 +refs/heads/master: b853fd364810a241050778124842a8c415c72a69 diff --git a/trunk/include/trace/events/ext4.h b/trunk/include/trace/events/ext4.h index 01e9e0076a92..6a1fcff95f7c 100644 --- a/trunk/include/trace/events/ext4.h +++ b/trunk/include/trace/events/ext4.h @@ -796,8 +796,9 @@ DECLARE_EVENT_CLASS(ext4__mballoc, ), TP_fast_assign( - __entry->dev = ac->ac_inode->i_sb->s_dev; - __entry->ino = ac->ac_inode->i_ino; + __entry->dev = ac->ac_sb->s_dev; + __entry->ino = ac->ac_inode ? + ac->ac_inode->i_ino : 0; __entry->result_logical = ac->ac_b_ex.fe_logical; __entry->result_start = ac->ac_b_ex.fe_start; __entry->result_group = ac->ac_b_ex.fe_group;