From: Andrew Gabbasov Date: Sun, 25 Nov 2012 21:12:46 +0000 (-0500) Subject: ext3 instrumentation: fix of assignment code conversion X-Git-Tag: v2.2.0-rc1~32 X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=630bed30fc8e1fd415d0a8eb520eb0f46436e35e ext3 instrumentation: fix of assignment code conversion Due to specifics of handling assignment code in lttng-modules, plain code in TP_fast_assign (outside tp_* macros) will not be reached. Everything should be enclosed into tp_* fragments. Signed-off-by: Andrew Gabbasov Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/ext3.h b/instrumentation/events/lttng-module/ext3.h index de80df95..f1b4aa97 100644 --- a/instrumentation/events/lttng-module/ext3.h +++ b/instrumentation/events/lttng-module/ext3.h @@ -6,12 +6,6 @@ #include -#ifndef _TRACE_EXT3_DEF -#define _TRACE_EXT3_DEF -static struct dentry *dentry; -#endif - - TRACE_EVENT(ext3_free_inode, TP_PROTO(struct inode *inode), @@ -441,12 +435,10 @@ TRACE_EVENT(ext3_sync_file_enter, ), TP_fast_assign( - dentry = file->f_path.dentry; - - tp_assign(dev, dentry->d_inode->i_sb->s_dev) - tp_assign(ino, dentry->d_inode->i_ino) + tp_assign(dev, file->f_path.dentry->d_inode->i_sb->s_dev) + tp_assign(ino, file->f_path.dentry->d_inode->i_ino) tp_assign(datasync, datasync) - tp_assign(parent, dentry->d_parent->d_inode->i_ino) + tp_assign(parent, file->f_path.dentry->d_parent->d_inode->i_ino) ), TP_printk("dev %d,%d ino %lu parent %ld datasync %d ",