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

Pull more vfs updates from Al Viro:
 "Embarrassing braino fix + pipe page accounting + fixing an eyesore in
  find_filesystem() (checking that s1 is equal to prefix of s2 of given
  length can be done in many ways, but "compare strlen(s1) with length
  and then do strncmp()" is not a good one...)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [regression] fix braino in fs/dlm/user.c
  pipe: limit the per-user amount of pages allocated in pipes
  find_filesystem(): simplify comparison

1 files changed, 14 insertions, 0 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 91420362e0b3..97715fd9e790 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1757,6 +1757,20 @@ static struct ctl_table fs_table[] = {
                 .proc_handler   = &pipe_proc_fn,
                 .extra1         = &pipe_min_size,
         },
+        {
+                .procname       = "pipe-user-pages-hard",
+                .data           = &pipe_user_pages_hard,
+                .maxlen         = sizeof(pipe_user_pages_hard),
+                .mode           = 0644,
+                .proc_handler   = proc_doulongvec_minmax,
+        },
+        {
+                .procname       = "pipe-user-pages-soft",
+                .data           = &pipe_user_pages_soft,
+                .maxlen         = sizeof(pipe_user_pages_soft),
+                .mode           = 0644,
+                .proc_handler   = proc_doulongvec_minmax,
+        },
         { }
 };