sysctl: remove /proc/sys/vm/nr_pdflush_threads

This tunable has been obsolete since 2.6.32, and writes to the
file have been failing and complaining in dmesg since then:

nr_pdflush_threads exported in /proc is scheduled for removal

That was 8 years ago. Remove the file ABI obsolete notice, and
the sysfs file.

Reviewed-by: Jan Kara <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads b/Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads
deleted file mode 100644 (file)
index b0b0eeb..0000000
--- a/Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads
+++ /dev/null
@@ -1,5 +0,0 @@
-What:          /proc/sys/vm/nr_pdflush_threads
-Date:          June 2012
-Contact:       Wanpeng Li <[email protected]>
-Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush
-             exported in /proc/sys/vm/ should be removed.

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 6648fbbb8157fc12703d02fa0fdc9ff85c527ac4..a5dd8d82c25385f2de8a4753ce49cb24777351dd 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1344,11 +1344,6 @@ static struct ctl_table vm_table[] = {
                .proc_handler   = dirtytime_interval_handler,
                .extra1         = &zero,
        },
-       {
-               .procname       = "nr_pdflush_threads",
-               .mode           = 0444 /* read-only */,
-               .proc_handler   = pdflush_proc_obsolete,
-       },
        {
                .procname       = "swappiness",
                .data           = &vm_swappiness,