Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / fs / f2fs / trace.c

diff --git a/fs/f2fs/trace.c b/fs/f2fs/trace.c
index 92fa38a47e638dd3a71064f531bbecc0b16b594e..875aa8179bc1733cb665724961856d86bca091bb 100644 (file)
--- a/fs/f2fs/trace.c
+++ b/fs/f2fs/trace.c
@@ -11,13 +11,14 @@
 #include <linux/fs.h>
 #include <linux/f2fs_fs.h>
 #include <linux/sched.h>
+#include <linux/radix-tree.h>
 
 #include "f2fs.h"
 #include "trace.h"
 
-RADIX_TREE(pids, GFP_ATOMIC);
-spinlock_t pids_lock;
-struct last_io_info last_io;
+static RADIX_TREE(pids, GFP_ATOMIC);
+static spinlock_t pids_lock;
+static struct last_io_info last_io;
 
 static inline void __print_last_io(void)
 {
@@ -120,3 +121,39 @@ void f2fs_build_trace_ios(void)
 {
        spin_lock_init(&pids_lock);
 }
+
+#define PIDVEC_SIZE    128
+static unsigned int gang_lookup_pids(pid_t *results, unsigned long first_index,
+                                                       unsigned int max_items)
+{
+       struct radix_tree_iter iter;
+       void **slot;
+       unsigned int ret = 0;
+
+       if (unlikely(!max_items))
+               return 0;
+
+       radix_tree_for_each_slot(slot, &pids, &iter, first_index) {
+               results[ret] = iter.index;
+               if (++ret == PIDVEC_SIZE)
+                       break;
+       }
+       return ret;
+}
+
+void f2fs_destroy_trace_ios(void)
+{
+       pid_t pid[PIDVEC_SIZE];
+       pid_t next_pid = 0;
+       unsigned int found;
+
+       spin_lock(&pids_lock);
+       while ((found = gang_lookup_pids(pid, next_pid, PIDVEC_SIZE))) {
+               unsigned idx;
+
+               next_pid = pid[found - 1] + 1;
+               for (idx = 0; idx < found; idx++)
+                       radix_tree_delete(&pids, pid[idx]);
+       }
+       spin_unlock(&pids_lock);
+}