1 files changed, 6 insertions, 6 deletions

diff --git a/src/vm.c b/src/vm.c
index cfced9535..a46fed7d3 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -30,12 +30,12 @@
 
 /* Create a VM pointer object. This kind of objects are used in place of
  * values in the key -> value hash table, for swapped out objects. */
-vmpointer *createVmPointer(int vtype) {
+vmpointer *createVmPointer(robj *o) {
     vmpointer *vp = zmalloc(sizeof(vmpointer));
 
     vp->type = REDIS_VMPOINTER;
     vp->storage = REDIS_VM_SWAPPED;
-    vp->vtype = vtype;
+    vp->vtype = getObjectSaveType(o);
     return vp;
 }
 
@@ -272,7 +272,7 @@ vmpointer *vmSwapObjectBlocking(robj *val) {
     if (vmFindContiguousPages(&page,pages) == REDIS_ERR) return NULL;
     if (vmWriteObjectOnSwap(val,page) == REDIS_ERR) return NULL;
 
-    vp = createVmPointer(val->type);
+    vp = createVmPointer(val);
     vp->page = page;
     vp->usedpages = pages;
     decrRefCount(val); /* Deallocate the object from memory. */
@@ -380,7 +380,7 @@ double computeObjectSwappability(robj *o) {
         break;
     case REDIS_LIST:
         if (o->encoding == REDIS_ENCODING_ZIPLIST) {
-            asize = sizeof(*o)+ziplistSize(o->ptr);
+            asize = sizeof(*o)+ziplistBlobLen(o->ptr);
         } else {
             l = o->ptr;
             ln = listFirst(l);
@@ -411,7 +411,7 @@ double computeObjectSwappability(robj *o) {
         break;
     case REDIS_ZSET:
         if (o->encoding == REDIS_ENCODING_ZIPLIST) {
-            asize = sizeof(*o)+(ziplistSize(o->ptr) / 2);
+            asize = sizeof(*o)+(ziplistBlobLen(o->ptr) / 2);
         } else {
             d = ((zset*)o->ptr)->dict;
             asize = sizeof(zset)+(sizeof(struct dictEntry*)*dictSlots(d));
@@ -663,7 +663,7 @@ void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
                 printf("val->ptr: %s\n",(char*)j->val->ptr);
             }
             redisAssert(j->val->storage == REDIS_VM_SWAPPING);
-            vp = createVmPointer(j->val->type);
+            vp = createVmPointer(j->val);
             vp->page = j->page;
             vp->usedpages = j->pages;
             dictGetEntryVal(de) = vp;