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

fs: fs-writeback: move sysctl to fs/fs-writeback.c 



The dirtytime_expire_interval belongs to fs/fs-writeback.c, move it to
fs/fs-writeback.c from /kernel/sysctl.c. And remove the useless extern
variable declaration and the function declaration from
include/linux/writeback.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 avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent 97f5420e

fs/fs-writeback.c

+21 −9
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct wb_writeback_work { 
 * timestamps written to disk after 12 hours, but in the worst case a

 * few inodes might not their timestamps updated for 24 hours.

 */

unsigned int dirtytime_expire_interval = 12 * 60 * 60;

static unsigned int dirtytime_expire_interval = 12 * 60 * 60;



static inline struct inode *wb_inode(struct list_head *head)

{
@@ -2435,14 +2435,7 @@ static void wakeup_dirtytime_writeback(struct work_struct *w) 
	schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);

}



static int __init start_dirtytime_writeback(void)

{

	schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);

	return 0;

}

__initcall(start_dirtytime_writeback);



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

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

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

{

	int ret;
@@ -2453,6 +2446,25 @@ int dirtytime_interval_handler(const struct ctl_table *table, int write, 
	return ret;

}



static const struct ctl_table vm_fs_writeback_table[] = {

	{

		.procname	= "dirtytime_expire_seconds",

		.data		= &dirtytime_expire_interval,

		.maxlen		= sizeof(dirtytime_expire_interval),

		.mode		= 0644,

		.proc_handler	= dirtytime_interval_handler,

		.extra1		= SYSCTL_ZERO,

	},

};



static int __init start_dirtytime_writeback(void)

{

	schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);

	register_sysctl_init("vm", vm_fs_writeback_table);

	return 0;

}

__initcall(start_dirtytime_writeback);



/**

 * __mark_inode_dirty -	internal function to mark an inode dirty

 *

include/linux/writeback.h

+0 −4
Original line number Diff line number Diff line
@@ -327,12 +327,8 @@ extern struct wb_domain global_wb_domain; 
/* These are exported to sysctl. */

extern unsigned int dirty_writeback_interval;

extern unsigned int dirty_expire_interval;

extern unsigned int dirtytime_expire_interval;

extern int laptop_mode;



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

		void *buffer, size_t *lenp, loff_t *ppos);



void global_dirty_limits(unsigned long *pbackground, unsigned long *pdirty);

unsigned long wb_calc_thresh(struct bdi_writeback *wb, unsigned long thresh);

unsigned long cgwb_calc_thresh(struct bdi_writeback *wb);

kernel/sysctl.c

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



static const struct ctl_table vm_table[] = {

	{

		.procname	= "dirtytime_expire_seconds",

		.data		= &dirtytime_expire_interval,

		.maxlen		= sizeof(dirtytime_expire_interval),

		.mode		= 0644,

		.proc_handler	= dirtytime_interval_handler,

		.extra1		= SYSCTL_ZERO,

	},

	{

		.procname	= "drop_caches",

		.data		= &sysctl_drop_caches,