Unplug before sending close() message, to avoid screwing up interfaces

which respond to close with a reopen() (e.g. iSCSI).

diff --git a/src/core/job.c b/src/core/job.c
index 00c0e6c419b12b87d968853f45296022ac816993..6c2faf30f4ff943e794df38b0b0e0837b87e4155 100644 (file)
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -29,16 +29,16 @@
 void job_done ( struct job_interface *job, int rc ) {
        struct job_interface *dest = job_get_dest ( job );
 
-       dest->op->done ( dest, rc );
        job_unplug ( job );
+       dest->op->done ( dest, rc );
        job_put ( dest );
 }
 
 void job_kill ( struct job_interface *job ) {
        struct job_interface *dest = job_get_dest ( job );
 
-       dest->op->kill ( dest );
        job_unplug ( job );
+       dest->op->kill ( dest );
        job_put ( dest );
 }
 

diff --git a/src/core/resolv.c b/src/core/resolv.c
index 5c25ddb121c86d51486665ae65564ba6083fb4c4..808ab657f69d9c2eb55cefa3d87fef5c6927e983 100644 (file)
--- a/src/core/resolv.c
+++ b/src/core/resolv.c
@@ -50,8 +50,8 @@ void resolv_done ( struct resolv_interface *resolv, struct sockaddr *sa,
                   int rc ) {
        struct resolv_interface *dest = resolv_get_dest ( resolv );
 
-       dest->op->done ( dest, sa, rc );
        resolv_unplug ( resolv );
+       dest->op->done ( dest, sa, rc );
        resolv_put ( dest );
 }
 

diff --git a/src/core/xfer.c b/src/core/xfer.c
index 0689587115234311b999949db451539bbeec2db2..3add057b9d6fef4967a01409367d2d51147f4bb9 100644 (file)
--- a/src/core/xfer.c
+++ b/src/core/xfer.c
@@ -38,8 +38,8 @@ void xfer_close ( struct xfer_interface *xfer, int rc ) {
 
        DBGC ( xfer, "XFER %p->%p close\n", xfer, dest );
 
-       dest->op->close ( dest, rc );
        xfer_unplug ( xfer );
+       dest->op->close ( dest, rc );
        xfer_put ( dest );
 }