diff options
| author | John Rigby <john.rigby@linaro.org> | 2012-05-21 01:43:15 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-05-22 21:29:37 -0600 |
| commit | 9d905045a932756707327e22df5bd948eb24879f (patch) | |
| tree | 451dab3424de6489b5035da73ecfd0a51452f5bd | |
| parent | e7ab681ebe80996a39d54877dddca396050b2548 (diff) | |
Revert "UBUNTU: SAUCE: (no-up) vfs: Add a trace point in the mark_inode_dirty function"ubuntu-sauce-only-topic
This reverts commit 1ad361fe486da92f52ff556780f825a400c62997.
| -rw-r--r-- | fs/fs-writeback.c | 3 | ||||
| -rw-r--r-- | fs/inode.c | 4 | ||||
| -rw-r--r-- | include/trace/events/vfs.h | 55 |
3 files changed, 0 insertions, 62 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index a4a1b59dc40..539f36cf3e4 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -27,7 +27,6 @@ #include <linux/blkdev.h> #include <linux/backing-dev.h> #include <linux/tracepoint.h> -#include <trace/events/vfs.h> #include "internal.h" /* @@ -1083,8 +1082,6 @@ void __mark_inode_dirty(struct inode *inode, int flags) if ((inode->i_state & flags) == flags) return; - trace_dirty_inode(inode, current); - if (unlikely(block_dump)) block_dump___mark_inode_dirty(inode); diff --git a/fs/inode.c b/fs/inode.c index 8cfc42a01db..bb0f3bad736 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1742,7 +1742,3 @@ bool inode_owner_or_capable(const struct inode *inode) return false; } EXPORT_SYMBOL(inode_owner_or_capable); - -#define CREATE_TRACE_POINTS -#include <trace/events/vfs.h> - diff --git a/include/trace/events/vfs.h b/include/trace/events/vfs.h deleted file mode 100644 index 26111290981..00000000000 --- a/include/trace/events/vfs.h +++ /dev/null @@ -1,55 +0,0 @@ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM vfs - -#include <linux/module.h> - -#if !defined(_TRACE_VFS_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_VFS_H - -/* - * Tracepoint for dirtying an inode: - */ -TRACE_EVENT(dirty_inode, - - TP_PROTO(struct inode *inode, struct task_struct *task), - - TP_ARGS(inode, task), - - TP_STRUCT__entry( - __array( char, comm, TASK_COMM_LEN ) - __field( pid_t, pid ) - __array( char, dev, 16 ) - __array( char, file, 32 ) - ), - - TP_fast_assign( - if (inode->i_ino || strcmp(inode->i_sb->s_id, "bdev")) { - struct dentry *dentry; - const char *name = "?"; - - dentry = d_find_alias(inode); - if (dentry) { - spin_lock(&dentry->d_lock); - name = (const char *) dentry->d_name.name; - } - - memcpy(__entry->comm, task->comm, TASK_COMM_LEN); - __entry->pid = task->pid; - strlcpy(__entry->file, name, 32); - strlcpy(__entry->dev, inode->i_sb->s_id, 16); - - if (dentry) { - spin_unlock(&dentry->d_lock); - dput(dentry); - } - } - ), - - TP_printk("task=%i (%s) file=%s dev=%s", - __entry->pid, __entry->comm, __entry->file, __entry->dev) -); - -#endif /* _TRACE_VFS_H */ - -/* This part must be outside protection */ -#include <trace/define_trace.h> |