Merge branch 'akpm' (second patch-bomb from Andrew)

Merge second patchbomb from Andrew Morton:
 - the rest of MM
 - misc fs fixes
 - add execveat() syscall
 - new ratelimit feature for fault-injection
 - decompressor updates
 - ipc/ updates
 - fallocate feature creep
 - fsnotify cleanups
 - a few other misc things

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (99 commits)
  cgroups: Documentation: fix trivial typos and wrong paragraph numberings
  parisc: percpu: update comments referring to __get_cpu_var
  percpu: update local_ops.txt to reflect this_cpu operations
  percpu: remove __get_cpu_var and __raw_get_cpu_var macros
  fsnotify: remove destroy_list from fsnotify_mark
  fsnotify: unify inode and mount marks handling
  fallocate: create FAN_MODIFY and IN_MODIFY events
  mm/cma: make kmemleak ignore CMA regions
  slub: fix cpuset check in get_any_partial
  slab: fix cpuset check in fallback_alloc
  shmdt: use i_size_read() instead of ->i_size
  ipc/shm.c: fix overly aggressive shmdt() when calls span multiple segments
  ipc/msg: increase MSGMNI, remove scaling
  ipc/sem.c: increase SEMMSL, SEMMNI, SEMOPM
  ipc/sem.c: change memory barrier in sem_lock() to smp_rmb()
  lib/decompress.c: consistency of compress formats for kernel image
  decompress_bunzip2: off by one in get_next_block()
  usr/Kconfig: make initrd compression algorithm selection not expert
  fault-inject: add ratelimit option
  ratelimit: add initialization macro
  ...

1 files changed, 17 insertions, 4 deletions

diff --git a/lib/fault-inject.c b/lib/fault-inject.c
index d7d501ea856d..f1cdeb024d17 100644
--- a/lib/fault-inject.c
+++ b/lib/fault-inject.c
@@ -40,10 +40,16 @@ EXPORT_SYMBOL_GPL(setup_fault_attr);
 
 static void fail_dump(struct fault_attr *attr)
 {
-        if (attr->verbose > 0)
-                printk(KERN_NOTICE "FAULT_INJECTION: forcing a failure\n");
-        if (attr->verbose > 1)
-                dump_stack();
+        if (attr->verbose > 0 && __ratelimit(&attr->ratelimit_state)) {
+                printk(KERN_NOTICE "FAULT_INJECTION: forcing a failure.\n"
+                       "name %pd, interval %lu, probability %lu, "
+                       "space %d, times %d\n", attr->dname,
+                       attr->probability, attr->interval,
+                       atomic_read(&attr->space),
+                       atomic_read(&attr->times));
+                if (attr->verbose > 1)
+                        dump_stack();
+        }
 }
 
 #define atomic_dec_not_zero(v)          atomic_add_unless((v), -1, 0)
@@ -202,6 +208,12 @@ struct dentry *fault_create_debugfs_attr(const char *name,
                 goto fail;
         if (!debugfs_create_ul("verbose", mode, dir, &attr->verbose))
                 goto fail;
+        if (!debugfs_create_u32("verbose_ratelimit_interval_ms", mode, dir,
+                                &attr->ratelimit_state.interval))
+                goto fail;
+        if (!debugfs_create_u32("verbose_ratelimit_burst", mode, dir,
+                                &attr->ratelimit_state.burst))
+                goto fail;
         if (!debugfs_create_bool("task-filter", mode, dir, &attr->task_filter))
                 goto fail;
 
@@ -222,6 +234,7 @@ struct dentry *fault_create_debugfs_attr(const char *name,
 
 #endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
 
+        attr->dname = dget(dir);
         return dir;
 fail:
         debugfs_remove_recursive(dir);