Patchwork [1/2] Revert "UBUNTU: SAUCE: trace: add trace_event for the open() syscall"

login
register
mail settings
Submitter Scott James Remnant
Date Oct. 27, 2009, 9:59 a.m.
Message ID <E1N2qCa-0007zL-LY@zelda.netsplit.com>
Download mbox | patch
Permalink /patch/37016/
State Accepted
Headers show

Comments

Scott James Remnant - Oct. 27, 2009, 9:59 a.m.
This reverts commit 8cced4c6dcdcc6ba4a679dcf7ebb3000045a581f.
---
 fs/open.c                 |    4 ----
 include/trace/events/fs.h |   35 -----------------------------------
 2 files changed, 0 insertions(+), 39 deletions(-)
 delete mode 100644 include/trace/events/fs.h
Stefan Bader - Oct. 29, 2009, 10:29 a.m.
Scott James Remnant wrote:
> This reverts commit 8cced4c6dcdcc6ba4a679dcf7ebb3000045a581f.

Acked-by: Stefan Bader <stefan.bader@canonical.com>

> ---
>  fs/open.c                 |    4 ----
>  include/trace/events/fs.h |   35 -----------------------------------
>  2 files changed, 0 insertions(+), 39 deletions(-)
>  delete mode 100644 include/trace/events/fs.h
> 
> diff --git a/fs/open.c b/fs/open.c
> index 41c87f3..04b9aad 100644
> --- a/fs/open.c
> +++ b/fs/open.c
> @@ -31,9 +31,6 @@
>  #include <linux/falloc.h>
>  #include <linux/fs_struct.h>
>  
> -#define CREATE_TRACE_POINTS
> -#include <trace/events/fs.h>
> -
>  int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
>  {
>  	int retval = -ENODEV;
> @@ -1044,7 +1041,6 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
>  			} else {
>  				fsnotify_open(f->f_path.dentry);
>  				fd_install(fd, f);
> -				trace_do_sys_open(tmp, flags, mode);
>  			}
>  		}
>  		putname(tmp);
> diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
> deleted file mode 100644
> index ae330c8..0000000
> --- a/include/trace/events/fs.h
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -#undef TRACE_SYSTEM
> -#define TRACE_SYSTEM fs
> -
> -#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
> -#define _TRACE_FS_H
> -
> -#include <linux/fs.h>
> -#include <linux/tracepoint.h>
> -
> -TRACE_EVENT(do_sys_open,
> -
> -	TP_PROTO(char *filename, int flags, int mode),
> -
> -	TP_ARGS(filename, flags, mode),
> -
> -	TP_STRUCT__entry(
> -		__string(	filename, filename		)
> -		__field(	int, flags			)
> -		__field(	int, mode			)
> -	),
> -
> -	TP_fast_assign(
> -		__assign_str(filename, filename);
> -		__entry->flags = flags;
> -		__entry->mode = mode;
> -	),
> -
> -	TP_printk("\"%s\" %x %o",
> -		  __get_str(filename), __entry->flags, __entry->mode)
> -);
> -
> -#endif /* _TRACE_FS_H */
> -
> -/* This part must be outside protection */
> -#include <trace/define_trace.h>

Patch

diff --git a/fs/open.c b/fs/open.c
index 41c87f3..04b9aad 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -31,9 +31,6 @@ 
 #include <linux/falloc.h>
 #include <linux/fs_struct.h>
 
-#define CREATE_TRACE_POINTS
-#include <trace/events/fs.h>
-
 int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
 	int retval = -ENODEV;
@@ -1044,7 +1041,6 @@  long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
 			} else {
 				fsnotify_open(f->f_path.dentry);
 				fd_install(fd, f);
-				trace_do_sys_open(tmp, flags, mode);
 			}
 		}
 		putname(tmp);
diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
deleted file mode 100644
index ae330c8..0000000
--- a/include/trace/events/fs.h
+++ /dev/null
@@ -1,35 +0,0 @@ 
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM fs
-
-#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_FS_H
-
-#include <linux/fs.h>
-#include <linux/tracepoint.h>
-
-TRACE_EVENT(do_sys_open,
-
-	TP_PROTO(char *filename, int flags, int mode),
-
-	TP_ARGS(filename, flags, mode),
-
-	TP_STRUCT__entry(
-		__string(	filename, filename		)
-		__field(	int, flags			)
-		__field(	int, mode			)
-	),
-
-	TP_fast_assign(
-		__assign_str(filename, filename);
-		__entry->flags = flags;
-		__entry->mode = mode;
-	),
-
-	TP_printk("\"%s\" %x %o",
-		  __get_str(filename), __entry->flags, __entry->mode)
-);
-
-#endif /* _TRACE_FS_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>