Ticket #38: session-release.diff

HostDrivers/Support/os2/SUPDrv-os2.cpp

@@ -222 +222 @@
     /*
      * Close the session.
      */
-    supdrvSessionRelease(pSession);
+    if (pSession)
+        supdrvSessionRelease(pSession);
+
     return 0;
 }
 
@@ -245 +247 @@
                &&   (   pSession->sfn != sfn
                      || pSession->Process != Process));
 
-        if (RT_LIKELY(pSession))
-            supdrvSessionRetain(pSession);
     }
     RTSpinlockRelease(g_Spinlock);
-    if (RT_UNLIKELY(!pSession))
+    if (!pSession)
     {
         OSDBGPRINT(("VBoxDrvIoctl: WHUT?!? pSession == NULL! This must be a mistake... pid=%d\n", (int)Process));
         return VERR_INVALID_PARAMETER;
@@ -259 +259 @@
      * Dispatch the fast IOCtl.
      */
     supdrvIOCtlFast(iFunction, 0, &g_DevExt, pSession);
-    supdrvSessionRelease(pSession);
     return 0;
 }
 
@@ -282 +281 @@
         while (     pSession
                &&   (   pSession->sfn != sfn
                      || pSession->Process != Process));
-
-        if (RT_LIKELY(pSession))
-            supdrvSessionRetain(pSession);
     }
     RTSpinlockRelease(g_Spinlock);
     if (!pSession)
@@ -359 +355 @@
     else
         rc = VERR_NOT_SUPPORTED;
 
-    supdrvSessionRelease(pSession);
     Log2(("VBoxDrvIOCtl: returns %d\n", rc));
     return rc;
 }