init.c: use list macro when removing pdus from the wait list

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index d65520354f80ea2457c6bf633a85b4bfe9ee18db..bbed183fdf4fc8367d63d4630fdc96da2d2891dd 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -222,7 +222,7 @@ int rpc_add_fragment(struct rpc_context *rpc, char *data, uint64_t size)
        }
 
        memcpy(fragment->data, data, fragment->size);
-       SLIST_ADD_END(&rpc->fragments, fragment);
+       LIBNFS_LIST_ADD_END(&rpc->fragments, fragment);
        return 0;
 }
 
@@ -235,7 +235,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
 
        while((pdu = rpc->outqueue.head) != NULL) {
                pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
-               rpc->outqueue.head = pdu->next;
+               LIBNFS_LIST_REMOVE(&rpc->outqueue.head, pdu);
                rpc_free_pdu(rpc, pdu);
        }
 
@@ -244,7 +244,7 @@ void rpc_destroy_context(struct rpc_context *rpc)
 
                while((pdu = q->head) != NULL) {
                        pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
-                       rpc->outqueue.head = pdu->next;
+                       LIBNFS_LIST_REMOVE(&q->head, pdu);
                        rpc_free_pdu(rpc, pdu);
                }
        }