Refresh of iom-dbg

diff --git a/src/rsocket.c b/src/rsocket.c
index 7f1839c71c00e0be8875b6a8e187c3c1f3a51bd6..a26136dd4b1ac7646ee16371a064ad6497057955 100644 (file)
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -1458,12 +1458,8 @@ static int rs_send_iomaps(struct rsocket *rs, int flags)
                        break;
        }
 
-<<<<<<< current
        rs->iomap_pending = !dlist_empty(&rs->iomap_queue);
-=======
-       rs->iomap_pending = dlist_empty(&rs->iomap_queue);
        printf("%s - pending = %d\n", __func__, rs->iomap_pending);
->>>>>>> patched
        fastlock_release(&rs->iomap_lock);
        return ret;
 }