From patchwork Tue Oct 27 09:59:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott James Remnant X-Patchwork-Id: 37016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 7EFBFB7088 for ; Wed, 28 Oct 2009 04:52:22 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1N2qDP-00055F-P1; Tue, 27 Oct 2009 17:52:15 +0000 Received: from zelda.netsplit.com ([87.194.19.211]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1N2qCg-0004jf-5e for kernel-team@lists.ubuntu.com; Tue, 27 Oct 2009 17:51:32 +0000 Received: from scott by zelda.netsplit.com with local (Exim 4.69) (envelope-from ) id 1N2qCa-0007zL-LY for kernel-team@lists.ubuntu.com; Tue, 27 Oct 2009 17:51:24 +0000 From: Scott James Remnant Date: Tue, 27 Oct 2009 09:59:41 +0000 Subject: [PATCH 1/2] Revert "UBUNTU: SAUCE: trace: add trace_event for the open() syscall" To: kernel-team@lists.ubuntu.com In-Reply-To: <1256665780.2186.43.camel@wing-commander> References: <1256665780.2186.43.camel@wing-commander> Message-Id: X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This reverts commit 8cced4c6dcdcc6ba4a679dcf7ebb3000045a581f. Acked-by: Stefan Bader --- 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 #include -#define CREATE_TRACE_POINTS -#include - 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 -#include - -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