ore: Make ore_striping_info and ore_calc_stripe_info public
[linux-2.6.git] / kernel / lockdep_proc.c
index fba81f1..71edd2f 100644 (file)
 
 static void *l_next(struct seq_file *m, void *v, loff_t *pos)
 {
-       struct lock_class *class;
-
-       (*pos)++;
-
-       if (v == SEQ_START_TOKEN)
-               class = m->private;
-       else {
-               class = v;
-
-               if (class->lock_entry.next != &all_lock_classes)
-                       class = list_entry(class->lock_entry.next,
-                                          struct lock_class, lock_entry);
-               else
-                       class = NULL;
-       }
-
-       return class;
+       return seq_list_next(v, &all_lock_classes, pos);
 }
 
 static void *l_start(struct seq_file *m, loff_t *pos)
 {
-       struct lock_class *class;
-       loff_t i = 0;
-
-       if (*pos == 0)
-               return SEQ_START_TOKEN;
-
-       list_for_each_entry(class, &all_lock_classes, lock_entry) {
-               if (++i == *pos)
-               return class;
-       }
-       return NULL;
+       return seq_list_start_head(&all_lock_classes, *pos);
 }
 
 static void l_stop(struct seq_file *m, void *v)
@@ -82,11 +56,11 @@ static void print_name(struct seq_file *m, struct lock_class *class)
 
 static int l_show(struct seq_file *m, void *v)
 {
-       struct lock_class *class = v;
+       struct lock_class *class = list_entry(v, struct lock_class, lock_entry);
        struct lock_list *entry;
        char usage[LOCK_USAGE_CHARS];
 
-       if (v == SEQ_START_TOKEN) {
+       if (v == &all_lock_classes) {
                seq_printf(m, "all lock classes:\n");
                return 0;
        }
@@ -128,17 +102,7 @@ static const struct seq_operations lockdep_ops = {
 
 static int lockdep_open(struct inode *inode, struct file *file)
 {
-       int res = seq_open(file, &lockdep_ops);
-       if (!res) {
-               struct seq_file *m = file->private_data;
-
-               if (!list_empty(&all_lock_classes))
-                       m->private = list_entry(all_lock_classes.next,
-                                       struct lock_class, lock_entry);
-               else
-                       m->private = NULL;
-       }
-       return res;
+       return seq_open(file, &lockdep_ops);
 }
 
 static const struct file_operations proc_lockdep_operations = {
@@ -149,37 +113,23 @@ static const struct file_operations proc_lockdep_operations = {
 };
 
 #ifdef CONFIG_PROVE_LOCKING
-static void *lc_next(struct seq_file *m, void *v, loff_t *pos)
-{
-       struct lock_chain *chain;
-
-       (*pos)++;
-
-       if (v == SEQ_START_TOKEN)
-               chain = m->private;
-       else {
-               chain = v;
-
-               if (*pos < nr_lock_chains)
-                       chain = lock_chains + *pos;
-               else
-                       chain = NULL;
-       }
-
-       return chain;
-}
-
 static void *lc_start(struct seq_file *m, loff_t *pos)
 {
        if (*pos == 0)
                return SEQ_START_TOKEN;
 
-       if (*pos < nr_lock_chains)
-               return lock_chains + *pos;
+       if (*pos - 1 < nr_lock_chains)
+               return lock_chains + (*pos - 1);
 
        return NULL;
 }
 
+static void *lc_next(struct seq_file *m, void *v, loff_t *pos)
+{
+       (*pos)++;
+       return lc_start(m, pos);
+}
+
 static void lc_stop(struct seq_file *m, void *v)
 {
 }
@@ -220,16 +170,7 @@ static const struct seq_operations lockdep_chains_ops = {
 
 static int lockdep_chains_open(struct inode *inode, struct file *file)
 {
-       int res = seq_open(file, &lockdep_chains_ops);
-       if (!res) {
-               struct seq_file *m = file->private_data;
-
-               if (nr_lock_chains)
-                       m->private = lock_chains;
-               else
-                       m->private = NULL;
-       }
-       return res;
+       return seq_open(file, &lockdep_chains_ops);
 }
 
 static const struct file_operations proc_lockdep_chains_operations = {
@@ -243,40 +184,34 @@ static const struct file_operations proc_lockdep_chains_operations = {
 static void lockdep_stats_debug_show(struct seq_file *m)
 {
 #ifdef CONFIG_DEBUG_LOCKDEP
-       unsigned int hi1 = debug_atomic_read(&hardirqs_on_events),
-                    hi2 = debug_atomic_read(&hardirqs_off_events),
-                    hr1 = debug_atomic_read(&redundant_hardirqs_on),
-                    hr2 = debug_atomic_read(&redundant_hardirqs_off),
-                    si1 = debug_atomic_read(&softirqs_on_events),
-                    si2 = debug_atomic_read(&softirqs_off_events),
-                    sr1 = debug_atomic_read(&redundant_softirqs_on),
-                    sr2 = debug_atomic_read(&redundant_softirqs_off);
-
-       seq_printf(m, " chain lookup misses:           %11u\n",
-               debug_atomic_read(&chain_lookup_misses));
-       seq_printf(m, " chain lookup hits:             %11u\n",
-               debug_atomic_read(&chain_lookup_hits));
-       seq_printf(m, " cyclic checks:                 %11u\n",
-               debug_atomic_read(&nr_cyclic_checks));
-       seq_printf(m, " cyclic-check recursions:       %11u\n",
-               debug_atomic_read(&nr_cyclic_check_recursions));
-       seq_printf(m, " find-mask forwards checks:     %11u\n",
-               debug_atomic_read(&nr_find_usage_forwards_checks));
-       seq_printf(m, " find-mask forwards recursions: %11u\n",
-               debug_atomic_read(&nr_find_usage_forwards_recursions));
-       seq_printf(m, " find-mask backwards checks:    %11u\n",
-               debug_atomic_read(&nr_find_usage_backwards_checks));
-       seq_printf(m, " find-mask backwards recursions:%11u\n",
-               debug_atomic_read(&nr_find_usage_backwards_recursions));
-
-       seq_printf(m, " hardirq on events:             %11u\n", hi1);
-       seq_printf(m, " hardirq off events:            %11u\n", hi2);
-       seq_printf(m, " redundant hardirq ons:         %11u\n", hr1);
-       seq_printf(m, " redundant hardirq offs:        %11u\n", hr2);
-       seq_printf(m, " softirq on events:             %11u\n", si1);
-       seq_printf(m, " softirq off events:            %11u\n", si2);
-       seq_printf(m, " redundant softirq ons:         %11u\n", sr1);
-       seq_printf(m, " redundant softirq offs:        %11u\n", sr2);
+       unsigned long long hi1 = debug_atomic_read(hardirqs_on_events),
+                          hi2 = debug_atomic_read(hardirqs_off_events),
+                          hr1 = debug_atomic_read(redundant_hardirqs_on),
+                          hr2 = debug_atomic_read(redundant_hardirqs_off),
+                          si1 = debug_atomic_read(softirqs_on_events),
+                          si2 = debug_atomic_read(softirqs_off_events),
+                          sr1 = debug_atomic_read(redundant_softirqs_on),
+                          sr2 = debug_atomic_read(redundant_softirqs_off);
+
+       seq_printf(m, " chain lookup misses:           %11llu\n",
+               debug_atomic_read(chain_lookup_misses));
+       seq_printf(m, " chain lookup hits:             %11llu\n",
+               debug_atomic_read(chain_lookup_hits));
+       seq_printf(m, " cyclic checks:                 %11llu\n",
+               debug_atomic_read(nr_cyclic_checks));
+       seq_printf(m, " find-mask forwards checks:     %11llu\n",
+               debug_atomic_read(nr_find_usage_forwards_checks));
+       seq_printf(m, " find-mask backwards checks:    %11llu\n",
+               debug_atomic_read(nr_find_usage_backwards_checks));
+
+       seq_printf(m, " hardirq on events:             %11llu\n", hi1);
+       seq_printf(m, " hardirq off events:            %11llu\n", hi2);
+       seq_printf(m, " redundant hardirq ons:         %11llu\n", hr1);
+       seq_printf(m, " redundant hardirq offs:        %11llu\n", hr2);
+       seq_printf(m, " softirq on events:             %11llu\n", si1);
+       seq_printf(m, " softirq off events:            %11llu\n", si2);
+       seq_printf(m, " redundant softirq ons:         %11llu\n", sr1);
+       seq_printf(m, " redundant softirq offs:        %11llu\n", sr2);
 #endif
 }
 
@@ -290,7 +225,7 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
                      nr_irq_read_safe = 0, nr_irq_read_unsafe = 0,
                      nr_softirq_read_safe = 0, nr_softirq_read_unsafe = 0,
                      nr_hardirq_read_safe = 0, nr_hardirq_read_unsafe = 0,
-                     sum_forward_deps = 0, factor = 0;
+                     sum_forward_deps = 0;
 
        list_for_each_entry(class, &all_lock_classes, lock_entry) {
 
@@ -328,7 +263,7 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
 #endif
        }
 #ifdef CONFIG_DEBUG_LOCKDEP
-       DEBUG_LOCKS_WARN_ON(debug_atomic_read(&nr_unused_locks) != nr_unused);
+       DEBUG_LOCKS_WARN_ON(debug_atomic_read(nr_unused_locks) != nr_unused);
 #endif
        seq_printf(m, " lock-classes:                  %11lu [max: %lu]\n",
                        nr_lock_classes, MAX_LOCKDEP_KEYS);
@@ -348,13 +283,6 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
                        nr_hardirq_unsafe * nr_hardirq_safe +
                        nr_list_entries);
 
-       /*
-        * Estimated factor between direct and indirect
-        * dependencies:
-        */
-       if (nr_list_entries)
-               factor = sum_forward_deps / nr_list_entries;
-
 #ifdef CONFIG_PROVE_LOCKING
        seq_printf(m, " dependency chains:             %11lu [max: %lu]\n",
                        nr_lock_chains, MAX_LOCKDEP_CHAINS);
@@ -409,8 +337,6 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
                        nr_unused);
        seq_printf(m, " max locking depth:             %11u\n",
                        max_lockdep_depth);
-       seq_printf(m, " max recursion depth:           %11u\n",
-                       max_recursion_depth);
 #ifdef CONFIG_PROVE_LOCKING
        seq_printf(m, " max bfs queue depth:           %11u\n",
                        max_bfs_queue_depth);
@@ -442,7 +368,6 @@ struct lock_stat_data {
 };
 
 struct lock_stat_seq {
-       struct lock_stat_data *iter;
        struct lock_stat_data *iter_end;
        struct lock_stat_data stats[MAX_LOCKDEP_KEYS];
 };
@@ -562,7 +487,6 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
                namelen += 2;
 
        for (i = 0; i < LOCKSTAT_POINTS; i++) {
-               char sym[KSYM_SYMBOL_LEN];
                char ip[32];
 
                if (class->contention_point[i] == 0)
@@ -571,15 +495,13 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
                if (!i)
                        seq_line(m, '-', 40-namelen, namelen);
 
-               sprint_symbol(sym, class->contention_point[i]);
                snprintf(ip, sizeof(ip), "[<%p>]",
                                (void *)class->contention_point[i]);
-               seq_printf(m, "%40s %14lu %29s %s\n", name,
-                               stats->contention_point[i],
-                               ip, sym);
+               seq_printf(m, "%40s %14lu %29s %pS\n",
+                          name, stats->contention_point[i],
+                          ip, (void *)class->contention_point[i]);
        }
        for (i = 0; i < LOCKSTAT_POINTS; i++) {
-               char sym[KSYM_SYMBOL_LEN];
                char ip[32];
 
                if (class->contending_point[i] == 0)
@@ -588,12 +510,11 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
                if (!i)
                        seq_line(m, '-', 40-namelen, namelen);
 
-               sprint_symbol(sym, class->contending_point[i]);
                snprintf(ip, sizeof(ip), "[<%p>]",
                                (void *)class->contending_point[i]);
-               seq_printf(m, "%40s %14lu %29s %s\n", name,
-                               stats->contending_point[i],
-                               ip, sym);
+               seq_printf(m, "%40s %14lu %29s %pS\n",
+                          name, stats->contending_point[i],
+                          ip, (void *)class->contending_point[i]);
        }
        if (i) {
                seq_puts(m, "\n");
@@ -630,34 +551,22 @@ static void seq_header(struct seq_file *m)
 static void *ls_start(struct seq_file *m, loff_t *pos)
 {
        struct lock_stat_seq *data = m->private;
+       struct lock_stat_data *iter;
 
        if (*pos == 0)
                return SEQ_START_TOKEN;
 
-       data->iter = data->stats + *pos;
-       if (data->iter >= data->iter_end)
-               data->iter = NULL;
+       iter = data->stats + (*pos - 1);
+       if (iter >= data->iter_end)
+               iter = NULL;
 
-       return data->iter;
+       return iter;
 }
 
 static void *ls_next(struct seq_file *m, void *v, loff_t *pos)
 {
-       struct lock_stat_seq *data = m->private;
-
        (*pos)++;
-
-       if (v == SEQ_START_TOKEN)
-               data->iter = data->stats;
-       else {
-               data->iter = v;
-               data->iter++;
-       }
-
-       if (data->iter == data->iter_end)
-               data->iter = NULL;
-
-       return data->iter;
+       return ls_start(m, pos);
 }
 
 static void ls_stop(struct seq_file *m, void *v)
@@ -674,7 +583,7 @@ static int ls_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static struct seq_operations lockstat_ops = {
+static const struct seq_operations lockstat_ops = {
        .start  = ls_start,
        .next   = ls_next,
        .stop   = ls_stop,
@@ -695,7 +604,6 @@ static int lock_stat_open(struct inode *inode, struct file *file)
                struct lock_stat_data *iter = data->stats;
                struct seq_file *m = file->private_data;
 
-               data->iter = iter;
                list_for_each_entry(class, &all_lock_classes, lock_entry) {
                        iter->class = class;
                        iter->stats = lock_stats(class);
@@ -703,7 +611,7 @@ static int lock_stat_open(struct inode *inode, struct file *file)
                }
                data->iter_end = iter;
 
-               sort(data->stats, data->iter_end - data->iter,
+               sort(data->stats, data->iter_end - data->stats,
                                sizeof(struct lock_stat_data),
                                lock_stat_cmp, NULL);
 
@@ -738,7 +646,6 @@ static int lock_stat_release(struct inode *inode, struct file *file)
        struct seq_file *seq = file->private_data;
 
        vfree(seq->private);
-       seq->private = NULL;
        return seq_release(inode, file);
 }
 
@@ -762,7 +669,8 @@ static int __init lockdep_proc_init(void)
                    &proc_lockdep_stats_operations);
 
 #ifdef CONFIG_LOCK_STAT
-       proc_create("lock_stat", S_IRUSR, NULL, &proc_lock_stat_operations);
+       proc_create("lock_stat", S_IRUSR | S_IWUSR, NULL,
+                   &proc_lock_stat_operations);
 #endif
 
        return 0;