Commit f5d64ae3 authored by Kaixiong Yu's avatar Kaixiong Yu Committed by Joel Granados
Browse files

fs: drop_caches: move sysctl to fs/drop_caches.c 



The sysctl_drop_caches to fs/drop_caches.c, move it to
fs/drop_caches.c from /kernel/sysctl.c. And remove the
useless extern variable declaration from include/linux/mm.h

Signed-off-by: default avatarKaixiong Yu <yukaixiong@huawei.com>
Reviewed-by: default avatarKees Cook <kees@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent 94eed61d

fs/drop_caches.c

+21 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include "internal.h"



/* A global variable is a bit ugly, but it keeps the code simple */

int sysctl_drop_caches;

static int sysctl_drop_caches;



static void drop_pagecache_sb(struct super_block *sb, void *unused)

{
@@ -48,7 +48,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) 
	iput(toput_inode);

}



int drop_caches_sysctl_handler(const struct ctl_table *table, int write,

static int drop_caches_sysctl_handler(const struct ctl_table *table, int write,

		void *buffer, size_t *length, loff_t *ppos)

{

	int ret;
@@ -77,3 +77,22 @@ int drop_caches_sysctl_handler(const struct ctl_table *table, int write, 
	}

	return 0;

}



static const struct ctl_table drop_caches_table[] = {

	{

		.procname	= "drop_caches",

		.data		= &sysctl_drop_caches,

		.maxlen		= sizeof(int),

		.mode		= 0200,

		.proc_handler	= drop_caches_sysctl_handler,

		.extra1		= SYSCTL_ONE,

		.extra2		= SYSCTL_FOUR,

	},

};



static int __init init_vm_drop_caches_sysctls(void)

{

	register_sysctl_init("vm", drop_caches_table);

	return 0;

}

fs_initcall(init_vm_drop_caches_sysctls);

include/linux/mm.h

+0 −6
Original line number Diff line number Diff line
@@ -3789,12 +3789,6 @@ static inline int in_gate_area(struct mm_struct *mm, unsigned long addr) 


extern bool process_shares_mm(struct task_struct *p, struct mm_struct *mm);



#ifdef CONFIG_SYSCTL

extern int sysctl_drop_caches;

int drop_caches_sysctl_handler(const struct ctl_table *, int, void *, size_t *,

		loff_t *);

#endif



void drop_slab(void);



#ifndef CONFIG_MMU

kernel/sysctl.c

+0 −9
Original line number Diff line number Diff line
@@ -2014,15 +2014,6 @@ static const struct ctl_table kern_table[] = { 
};



static const struct ctl_table vm_table[] = {

	{

		.procname	= "drop_caches",

		.data		= &sysctl_drop_caches,

		.maxlen		= sizeof(int),

		.mode		= 0200,

		.proc_handler	= drop_caches_sysctl_handler,

		.extra1		= SYSCTL_ONE,

		.extra2		= SYSCTL_FOUR,

	},

	{

		.procname	= "vfs_cache_pressure",

		.data		= &sysctl_vfs_cache_pressure,