@@ -322,10 +322,10 @@ static void mrecv_ack_del(mdata *data, struct sockaddr_in *addr)

           lprintf(1, "%s: (dryrun) delete %s\n", __func__, path);

         }else{

           if(!mremove(NULL,path)){

-            lprintf(1, "%s: delete %s\n", __func__, path);

+            lprintf(1, "%s: delete %s rid=%d\n", __func__, path, m->mdata.head.reqid);

           }else{

             err = errno;

-            lprintf(0, "%s: delete error %s (%s)\n", __func__, path, strerror(errno));

+            lprintf(0, "%s: delete error %s (%s) rid=%d\n", __func__, path, strerror(errno), m->mdata.head.reqid);

           }

         }

         data_safeset16(&(m->mdata), len + sizeof(uint32_t));

@@ -1295,6 +1295,7 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)

   if(!m){

     return;

   }

+  mtimeget(&(m->lastrecv));

   if(m->mdata.head.nstate != MAKUO_RECVSTATE_OPEN){

     return;

   }

@@ -1087,20 +1087,20 @@ static void msend_req_del_stat(int s, mfile *m)

 {

   if(m->pipe != -1){

     msend_req_del_stat_read(s, m);

+    return;

+  }

+  if(msend_req_del_stat_waitcheck(s, m)){

+    m->sendwait = 1;

+    return;

+  }

+  if(m->link){

+    msend(mkack(&(m->link->mdata), &(m->link->addr), MAKUO_RECVSTATE_CLOSE)); /* send ack for dsync */

+  }

+  if(waitpid(m->pid, NULL, WNOHANG) != m->pid){

+    m->sendwait = 1;

   }else{

-    if(msend_req_del_stat_waitcheck(s, m)){

-      m->sendwait = 1;

-    }else{

-      if(m->link){

-        msend(mkack(&(m->link->mdata), &(m->link->addr), MAKUO_RECVSTATE_CLOSE));

-      }

-      if(waitpid(m->pid, NULL, WNOHANG) != m->pid){

-        m->sendwait = 1;

-      }else{

-        m->pid = 0;

-        msend_mfdel(m);

-      }

-    }

+    m->pid = 0;

+    msend_mfdel(m);

   }

 }

@@ -1110,6 +1110,7 @@ static void msend_req_del_break(int s, mfile *m)

   for(d=mftop[MFSEND];d;d=d->next){

     if(d->link == m){

       if(d->mdata.head.nstate == MAKUO_SENDSTATE_WAIT){

+        d->link = NULL;

         msend_mfdel(d);

         break;

       }