From bbf8bab47e32c25e0a84f87eb22c1ec35c3b2f63 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 6 Sep 2012 15:40:20 +0300 Subject: [PATCH] --- yaml --- r: 324932 b: refs/heads/master c: f0290de23de19b592b2934cdf21c0c0c2eb16500 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ramster/zcache-main.c | 10 ++++++---- trunk/drivers/staging/ramster/zcache.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a5f9104454a2..ffa8066f7ef8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d08d6cfe3b594b797e1204891613d1cdf70fb0c7 +refs/heads/master: f0290de23de19b592b2934cdf21c0c0c2eb16500 diff --git a/trunk/drivers/staging/ramster/zcache-main.c b/trunk/drivers/staging/ramster/zcache-main.c index 24b3d4a5e176..86e19d6d3b89 100644 --- a/trunk/drivers/staging/ramster/zcache-main.c +++ b/trunk/drivers/staging/ramster/zcache-main.c @@ -1338,10 +1338,10 @@ static int zcache_local_new_pool(uint32_t flags) return zcache_new_pool(LOCAL_CLIENT, flags); } -int zcache_autocreate_pool(int cli_id, int pool_id, bool eph) +int zcache_autocreate_pool(unsigned int cli_id, unsigned int pool_id, bool eph) { struct tmem_pool *pool; - struct zcache_client *cli = NULL; + struct zcache_client *cli; uint32_t flags = eph ? 0 : TMEM_POOL_PERSIST; int ret = -1; @@ -1350,8 +1350,10 @@ int zcache_autocreate_pool(int cli_id, int pool_id, bool eph) goto out; if (pool_id >= MAX_POOLS_PER_CLIENT) goto out; - else if ((unsigned int)cli_id < MAX_CLIENTS) - cli = &zcache_clients[cli_id]; + if (cli_id >= MAX_CLIENTS) + goto out; + + cli = &zcache_clients[cli_id]; if ((eph && disable_cleancache) || (!eph && disable_frontswap)) { pr_err("zcache_autocreate_pool: pool type disabled\n"); goto out; diff --git a/trunk/drivers/staging/ramster/zcache.h b/trunk/drivers/staging/ramster/zcache.h index c59666e6d717..81722b33b087 100644 --- a/trunk/drivers/staging/ramster/zcache.h +++ b/trunk/drivers/staging/ramster/zcache.h @@ -42,7 +42,7 @@ extern void zcache_decompress_to_page(char *, unsigned int, struct page *); #ifdef CONFIG_RAMSTER extern void *zcache_pampd_create(char *, unsigned int, bool, int, struct tmem_handle *); -extern int zcache_autocreate_pool(int, int, bool); +int zcache_autocreate_pool(unsigned int cli_id, unsigned int pool_id, bool eph); #endif #define MAX_POOLS_PER_CLIENT 16