staging: zcache: cleanup zcache_do_preload and zcache_put_page

Cleanup the code for zcache_do_preload and zcache_put_page

Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 16 insertions, 21 deletions

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 57e25fc6745..fbd9bcfa9d9 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -1045,29 +1045,24 @@ static int zcache_do_preload(struct tmem_pool *pool)
                 kp->objnodes[kp->nr++] = objnode;
         }
 
-        obj = kmem_cache_alloc(zcache_obj_cache, ZCACHE_GFP_MASK);
-        if (unlikely(obj == NULL)) {
-                zcache_failed_alloc++;
-                goto out;
+        if (!kp->obj) {
+                obj = kmem_cache_alloc(zcache_obj_cache, ZCACHE_GFP_MASK);
+                if (unlikely(obj == NULL)) {
+                        zcache_failed_alloc++;
+                        goto out;
+                }
+                kp->obj = obj;
         }
 
-        page = (void *)__get_free_page(ZCACHE_GFP_MASK);
-        if (unlikely(page == NULL)) {
-                zcache_failed_get_free_pages++;
-                kmem_cache_free(zcache_obj_cache, obj);
-                goto out;
+        if (!kp->page) {
+                page = (void *)__get_free_page(ZCACHE_GFP_MASK);
+                if (unlikely(page == NULL)) {
+                        zcache_failed_get_free_pages++;
+                        goto out;
+                }
+                kp->page =  page;
         }
 
-        if (kp->obj == NULL)
-                kp->obj = obj;
-        else
-                kmem_cache_free(zcache_obj_cache, obj);
-
-        if (kp->page == NULL)
-                kp->page = page;
-        else
-                free_page((unsigned long)page);
-
         ret = 0;
 out:
         return ret;
@@ -1577,14 +1572,14 @@ static int zcache_put_page(int cli_id, int pool_id, struct tmem_oid *oidp,
                         else
                                 zcache_failed_pers_puts++;
                 }
-                zcache_put_pool(pool);
         } else {
                 zcache_put_to_flush++;
                 if (atomic_read(&pool->obj_count) > 0)
                         /* the put fails whether the flush succeeds or not */
                         (void)tmem_flush_page(pool, oidp, index);
-                zcache_put_pool(pool);
         }
+
+        zcache_put_pool(pool);
 out:
         return ret;
 }