Skip to content

Commit 26363af

Browse files
Christoph HellwigAl Viro
authored andcommitted
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 <[email protected]> Acked-by: David Rientjes <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent 8f3d9f3 commit 26363af

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

include/linux/mmzone.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,6 @@ static inline int is_highmem(struct zone *zone)
911911
struct ctl_table;
912912
int min_free_kbytes_sysctl_handler(struct ctl_table *, int,
913913
void __user *, size_t *, loff_t *);
914-
int watermark_boost_factor_sysctl_handler(struct ctl_table *, int,
915-
void __user *, size_t *, loff_t *);
916914
int watermark_scale_factor_sysctl_handler(struct ctl_table *, int,
917915
void __user *, size_t *, loff_t *);
918916
extern int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES];

kernel/sysctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ static struct ctl_table vm_table[] = {
14911491
.data = &watermark_boost_factor,
14921492
.maxlen = sizeof(watermark_boost_factor),
14931493
.mode = 0644,
1494-
.proc_handler = watermark_boost_factor_sysctl_handler,
1494+
.proc_handler = proc_dointvec_minmax,
14951495
.extra1 = SYSCTL_ZERO,
14961496
},
14971497
{

mm/page_alloc.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7978,18 +7978,6 @@ int min_free_kbytes_sysctl_handler(struct ctl_table *table, int write,
79787978
return 0;
79797979
}
79807980

7981-
int watermark_boost_factor_sysctl_handler(struct ctl_table *table, int write,
7982-
void __user *buffer, size_t *length, loff_t *ppos)
7983-
{
7984-
int rc;
7985-
7986-
rc = proc_dointvec_minmax(table, write, buffer, length, ppos);
7987-
if (rc)
7988-
return rc;
7989-
7990-
return 0;
7991-
}
7992-
79937981
int watermark_scale_factor_sysctl_handler(struct ctl_table *table, int write,
79947982
void __user *buffer, size_t *length, loff_t *ppos)
79957983
{

0 commit comments

Comments
 (0)