Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux-2.6-microblaze.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c5f8227..f40d850 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1543,8 +1543,7 @@ static void latency_fsnotify_workfn(struct work_struct *work)
 {
        struct trace_array *tr = container_of(work, struct trace_array,
                                              fsnotify_work);
-       fsnotify(tr->d_max_latency->d_inode, FS_MODIFY,
-                tr->d_max_latency->d_inode, FSNOTIFY_EVENT_INODE, NULL, 0);
+       fsnotify_inode(tr->d_max_latency->d_inode, FS_MODIFY);
 }
 
 static void latency_fsnotify_workfn_irq(struct irq_work *iwork)
@@ -8985,9 +8984,7 @@ struct dentry *tracing_init_dentry(void)
        if (tr->dir)
                return NULL;
 
-       if (WARN_ON(!tracefs_initialized()) ||
-               (IS_ENABLED(CONFIG_DEBUG_FS) &&
-                WARN_ON(!debugfs_initialized())))
+       if (WARN_ON(!tracefs_initialized()))
                return ERR_PTR(-ENODEV);
 
        /*