Changes in uspace/srv/devmap/devmap.c [01b87dc5:47a7174f] in mainline

File:

• uspace/srv/devmap/devmap.c (modified) (11 diffs)

uspace/srv/devmap/devmap.c

@@ -46 +46 @@
 #include <str.h>
 #include <ipc/devmap.h>
-#include <assert.h>
 
 #define NAME          "devmap"
@@ -209 +208 @@
 }
 
-/** Find namespace with given name. */
+/** Find namespace with given name.
+ *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
+ */
 static devmap_namespace_t *devmap_namespace_find_name(const char *name)
 {
         link_t *item;
-        
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-        
         for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {
                 devmap_namespace_t *namespace =
@@ -228 +229 @@
 /** Find namespace with given handle.
  *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
  * @todo: use hash table
  *
@@ -234 +238 @@
 {
         link_t *item;
-        
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-        
         for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {
                 devmap_namespace_t *namespace =
@@ -247 +248 @@
 }
 
-/** Find device with given name. */
+/** Find device with given name.
+ *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
+ */
 static devmap_device_t *devmap_device_find_name(const char *ns_name,
     const char *name)
 {
         link_t *item;
-        
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-        
         for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
@@ -268 +271 @@
 /** Find device with given handle.
  *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
  * @todo: use hash table
  *
@@ -274 +280 @@
 {
         link_t *item;
-        
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-        
         for (item = devices_list.next; item != &devices_list; item = item->next) {
                 devmap_device_t *device =
@@ -287 +290 @@
 }
 
-/** Create a namespace (if not already present). */
+/** Create a namespace (if not already present)
+ *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
+ */
 static devmap_namespace_t *devmap_namespace_create(const char *ns_name)
 {
-        devmap_namespace_t *namespace;
-        
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-        
-        namespace = devmap_namespace_find_name(ns_name);
+        devmap_namespace_t *namespace = devmap_namespace_find_name(ns_name);
         if (namespace != NULL)
                 return namespace;
@@ -319 +323 @@
 }
 
-/** Destroy a namespace (if it is no longer needed). */
+/** Destroy a namespace (if it is no longer needed)
+ *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
+ */
 static void devmap_namespace_destroy(devmap_namespace_t *namespace)
 {
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-
         if (namespace->refcnt == 0) {
                 list_remove(&(namespace->namespaces));
@@ -332 +339 @@
 }
 
-/** Increase namespace reference count by including device. */
+/** Increase namespace reference count by including device
+ *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
+ */
 static void devmap_namespace_addref(devmap_namespace_t *namespace,
     devmap_device_t *device)
 {
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-
         device->namespace = namespace;
         namespace->refcnt++;
 }
 
-/** Decrease namespace reference count. */
+/** Decrease namespace reference count
+ *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
+ */
 static void devmap_namespace_delref(devmap_namespace_t *namespace)
 {
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-
         namespace->refcnt--;
         devmap_namespace_destroy(namespace);
 }
 
-/** Unregister device and free it. */
+/** Unregister device and free it
+ *
+ * The devices_list_mutex should be already held when
+ * calling this function.
+ *
+ */
 static void devmap_device_unregister_core(devmap_device_t *device)
 {
-        assert(fibril_mutex_is_locked(&devices_list_mutex));
-
         devmap_namespace_delref(device->namespace);
         list_remove(&(device->devices));
@@ -607 +623 @@
         
         if (dev->forward_interface == 0) {
+                /* The IPC_GET_ARG3(*icall) would be always zero,
+                 * wouldn't it? So why to pass it at all?
+                 */
                 ipc_forward_fast(callid, dev->driver->phone,
                     dev->handle, 0, 0,