mm: remove watermark_boost_factor_sysctl_handler

watermark_boost_factor_sysctl_handler is just a pointless wrapper for
proc_dointvec_minmax, so remove it and use proc_dointvec_minmax
directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 1b9de7d220fb7856b71fc54510bdabbfc947d096..f37bb8f187fc70b85addf30046c989a3e8e5e6a4 100644 (file)
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -911,8 +911,6 @@ static inline int is_highmem(struct zone *zone)
 struct ctl_table;
 int min_free_kbytes_sysctl_handler(struct ctl_table *, int,
                                        void __user *, size_t *, loff_t *);
-int watermark_boost_factor_sysctl_handler(struct ctl_table *, int,
-                                       void __user *, size_t *, loff_t *);
 int watermark_scale_factor_sysctl_handler(struct ctl_table *, int,
                                        void __user *, size_t *, loff_t *);
 extern int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES];

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 8a176d8727a3ab8e12c4b48fe9ff7c3afdd97465..99d27acf46465aa228990becee1dba4d9b9b9670 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1491,7 +1491,7 @@ static struct ctl_table vm_table[] = {
                .data           = &watermark_boost_factor,
                .maxlen         = sizeof(watermark_boost_factor),
                .mode           = 0644,
-               .proc_handler   = watermark_boost_factor_sysctl_handler,
+               .proc_handler   = proc_dointvec_minmax,
                .extra1         = SYSCTL_ZERO,
        },
        {

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 69827d4fa0527dc1dbacdc1b0af711df0929d89f..62c1550cd43ec7c0a374b36cbe8501864860fd34 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7978,18 +7978,6 @@ int min_free_kbytes_sysctl_handler(struct ctl_table *table, int write,
        return 0;
 }
 
-int watermark_boost_factor_sysctl_handler(struct ctl_table *table, int write,
-       void __user *buffer, size_t *length, loff_t *ppos)
-{
-       int rc;
-
-       rc = proc_dointvec_minmax(table, write, buffer, length, ppos);
-       if (rc)
-               return rc;
-
-       return 0;
-}
-
 int watermark_scale_factor_sysctl_handler(struct ctl_table *table, int write,
        void __user *buffer, size_t *length, loff_t *ppos)
 {