Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fd19653 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

xen/tmem: s/disable_// and change the logic. 



The variety of disable_[cleancache|frontswap|selfshrinking] are
making this a bit complex. Just remove the "disable_" part and
change the logic around for the "nofrontswap" and "nocleancache"
parameters.

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 23972c63

drivers/xen/tmem.c

+13 −14
Original line number Diff line number Diff line
@@ -32,15 +32,15 @@ __setup("tmem", enable_tmem); 
#endif



#ifdef CONFIG_CLEANCACHE

static bool disable_cleancache __read_mostly;

static bool disable_selfballooning __read_mostly;

static bool cleancache __read_mostly = true;

static bool selfballooning __read_mostly = true;

#ifdef CONFIG_XEN_TMEM_MODULE

module_param(disable_cleancache, bool, S_IRUGO);

module_param(disable_selfballooning, bool, S_IRUGO);

module_param(cleancache, bool, S_IRUGO);

module_param(selfballooning, bool, S_IRUGO);

#else

static int __init no_cleancache(char *s)

{

	disable_cleancache = true;

	cleancache = false;

	return 1;

}

__setup("nocleancache", no_cleancache);
@@ -48,13 +48,13 @@ __setup("nocleancache", no_cleancache); 
#endif /* CONFIG_CLEANCACHE */



#ifdef CONFIG_FRONTSWAP

static bool disable_frontswap __read_mostly;

static bool frontswap __read_mostly = true;

#ifdef CONFIG_XEN_TMEM_MODULE

module_param(disable_frontswap, bool, S_IRUGO);

module_param(frontswap, bool, S_IRUGO);

#else

static int __init no_frontswap(char *s)

{

	disable_frontswap = true;

	frontswap = false;

	return 1;

}

__setup("nofrontswap", no_frontswap);
@@ -62,9 +62,9 @@ __setup("nofrontswap", no_frontswap); 
#endif /* CONFIG_FRONTSWAP */



#ifdef CONFIG_XEN_SELFBALLOONING

static bool disable_frontswap_selfshrinking __read_mostly;

static bool frontswap_selfshrinking __read_mostly = true;

#ifdef CONFIG_XEN_TMEM_MODULE

module_param(disable_frontswap_selfshrinking, bool, S_IRUGO);

module_param(frontswap_selfshrinking, bool, S_IRUGO);

#endif

#endif /* CONFIG_XEN_SELFBALLOONING */
@@ -395,7 +395,7 @@ static int xen_tmem_init(void) 
	if (!xen_domain())

		return 0;

#ifdef CONFIG_FRONTSWAP

	if (tmem_enabled && !disable_frontswap) {

	if (tmem_enabled && frontswap) {

		char *s = "";

		struct frontswap_ops *old_ops =

			frontswap_register_ops(&tmem_frontswap_ops);
@@ -412,7 +412,7 @@ static int xen_tmem_init(void) 
#endif

#ifdef CONFIG_CLEANCACHE

	BUG_ON(sizeof(struct cleancache_filekey) != sizeof(struct tmem_oid));

	if (tmem_enabled && !disable_cleancache) {

	if (tmem_enabled && cleancache) {

		char *s = "";

		struct cleancache_ops *old_ops =

			cleancache_register_ops(&tmem_cleancache_ops);
@@ -423,8 +423,7 @@ static int xen_tmem_init(void) 
	}

#endif

#ifdef CONFIG_XEN_SELFBALLOONING

	xen_selfballoon_init(!disable_selfballooning,

				!disable_frontswap_selfshrinking);

	xen_selfballoon_init(selfballooning, frontswap_selfshrinking);

#endif

	return 0;

}