From 759e6550c71d14411579bd0f2412ee6d64830f5c Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 9 Aug 2011 21:01:33 +0300 Subject: [PATCH] --- yaml --- r: 263393 b: refs/heads/master c: 1dcab0875b113a148b6601d87b4e0e3444440339 h: refs/heads/master i: 263391: f306af4e6f20d8f12c49e08a79c75d2d56504d9a v: v3 --- [refs] | 2 +- trunk/drivers/staging/zcache/tmem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d7d314820a1e..5908174fca45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5f5c4db393837ebb2ae47bf061d70e498f48f8c +refs/heads/master: 1dcab0875b113a148b6601d87b4e0e3444440339 diff --git a/trunk/drivers/staging/zcache/tmem.c b/trunk/drivers/staging/zcache/tmem.c index 975e34bcd722..1ca66ea9b281 100644 --- a/trunk/drivers/staging/zcache/tmem.c +++ b/trunk/drivers/staging/zcache/tmem.c @@ -604,7 +604,7 @@ int tmem_get(struct tmem_pool *pool, struct tmem_oid *oidp, uint32_t index, struct tmem_obj *obj; void *pampd; bool ephemeral = is_ephemeral(pool); - uint32_t ret = -1; + int ret = -1; struct tmem_hashbucket *hb; bool free = (get_and_free == 1) || ((get_and_free == 0) && ephemeral); bool lock_held = false;