Skip to content

Commit

Permalink
zcache: s/int/bool/ on the various options.
Browse files Browse the repository at this point in the history
There are so many, but this allows us to at least have them
right in as bool.

Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
[v1: Rebase on ramster->zcache move]
[v2: Rebase on staging/zcache: Fix/improve zcache writeback code, tie to a config option]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Konrad Rzeszutek Wilk authored and Greg Kroah-Hartman committed Mar 5, 2013
1 parent 1e70bd4 commit 7937d74
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions drivers/staging/zcache/zcache-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
#include "zbud.h"
#include "ramster.h"
#ifdef CONFIG_RAMSTER
static int ramster_enabled;
static bool ramster_enabled __read_mostly;
#else
#define ramster_enabled 0
#define ramster_enabled false
#endif

#ifndef __PG_WAS_ACTIVE
Expand All @@ -62,11 +62,11 @@ static inline void frontswap_tmem_exclusive_gets(bool b)
/* enable (or fix code) when Seth's patches are accepted upstream */
#define zcache_writeback_enabled 0

static int zcache_enabled __read_mostly;
static int disable_cleancache __read_mostly;
static int disable_frontswap __read_mostly;
static int disable_frontswap_ignore_nonactive __read_mostly;
static int disable_cleancache_ignore_nonactive __read_mostly;
static bool zcache_enabled __read_mostly;
static bool disable_cleancache __read_mostly;
static bool disable_frontswap __read_mostly;
static bool disable_frontswap_ignore_nonactive __read_mostly;
static bool disable_cleancache_ignore_nonactive __read_mostly;
static char *namestr __read_mostly = "zcache";

#define ZCACHE_GFP_MASK \
Expand Down Expand Up @@ -1841,16 +1841,16 @@ struct frontswap_ops zcache_frontswap_register_ops(void)

static int __init enable_zcache(char *s)
{
zcache_enabled = 1;
zcache_enabled = true;
return 1;
}
__setup("zcache", enable_zcache);

static int __init enable_ramster(char *s)
{
zcache_enabled = 1;
zcache_enabled = true;
#ifdef CONFIG_RAMSTER
ramster_enabled = 1;
ramster_enabled = true;
#endif
return 1;
}
Expand All @@ -1860,15 +1860,15 @@ __setup("ramster", enable_ramster);

static int __init no_cleancache(char *s)
{
disable_cleancache = 1;
disable_cleancache = true;
return 1;
}

__setup("nocleancache", no_cleancache);

static int __init no_frontswap(char *s)
{
disable_frontswap = 1;
disable_frontswap = true;
return 1;
}

Expand All @@ -1884,15 +1884,15 @@ __setup("nofrontswapexclusivegets", no_frontswap_exclusive_gets);

static int __init no_frontswap_ignore_nonactive(char *s)
{
disable_frontswap_ignore_nonactive = 1;
disable_frontswap_ignore_nonactive = true;
return 1;
}

__setup("nofrontswapignorenonactive", no_frontswap_ignore_nonactive);

static int __init no_cleancache_ignore_nonactive(char *s)
{
disable_cleancache_ignore_nonactive = 1;
disable_cleancache_ignore_nonactive = true;
return 1;
}

Expand All @@ -1901,7 +1901,7 @@ __setup("nocleancacheignorenonactive", no_cleancache_ignore_nonactive);
static int __init enable_zcache_compressor(char *s)
{
strncpy(zcache_comp_name, s, ZCACHE_COMP_NAME_SZ);
zcache_enabled = 1;
zcache_enabled = true;
return 1;
}
__setup("zcache=", enable_zcache_compressor);
Expand Down

0 comments on commit 7937d74

Please sign in to comment.