X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/a9b18e54d4e348dd678a396cc8691dd693687de7..401c3e213c89d98bbeda399b4e17fbd636b80ac0:/src/vm.c diff --git a/src/vm.c b/src/vm.c index c2e0d9ed..ac0d92e3 100644 --- a/src/vm.c +++ b/src/vm.c @@ -263,7 +263,7 @@ int vmWriteObjectOnSwap(robj *o, off_t page) { * If we can't find enough contiguous empty pages to swap the object on disk * NULL is returned. */ vmpointer *vmSwapObjectBlocking(robj *val) { - off_t pages = rdbSavedObjectPages(val,NULL); + off_t pages = rdbSavedObjectPages(val); off_t page; vmpointer *vp; @@ -821,9 +821,7 @@ void *IOThreadEntryPoint(void *arg) { vmpointer *vp = (vmpointer*)j->id; j->val = vmReadObjectFromSwap(j->page,vp->vtype); } else if (j->type == REDIS_IOJOB_PREPARE_SWAP) { - FILE *fp = fopen("/dev/null","w+"); - j->pages = rdbSavedObjectPages(j->val,fp); - fclose(fp); + j->pages = rdbSavedObjectPages(j->val); } else if (j->type == REDIS_IOJOB_DO_SWAP) { if (vmWriteObjectOnSwap(j->val,j->page) == REDIS_ERR) j->canceled = 1;