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
Showing the changes to kernel/sysctl.c (1 of 7 files). Show all
Unified · Split
| @@ -1757,6 +1757,20 @@ static struct ctl_table fs_table[] = { · 1756 unmodified lines | ||
| 1757 | 1757 | .proc_handler = &pipe_proc_fn, |
| 1758 | 1758 | .extra1 = &pipe_min_size, |
| 1759 | 1759 | }, |
| 1760 | + { | |
| 1761 | + .procname = "pipe-user-pages-hard", | |
| 1762 | + .data = &pipe_user_pages_hard, | |
| 1763 | + .maxlen = sizeof(pipe_user_pages_hard), | |
| 1764 | + .mode = 0644, | |
| 1765 | + .proc_handler = proc_doulongvec_minmax, | |
| 1766 | + }, | |
| 1767 | + { | |
| 1768 | + .procname = "pipe-user-pages-soft", | |
| 1769 | + .data = &pipe_user_pages_soft, | |
| 1770 | + .maxlen = sizeof(pipe_user_pages_soft), | |
| 1771 | + .mode = 0644, | |
| 1772 | + .proc_handler = proc_doulongvec_minmax, | |
| 1773 | + }, | |
| 1760 | 1774 | { } |
| 1761 | 1775 | }; |
| 1762 | 1776 | |