Changeset 1b11576d in mainline for uspace/srv

Timestamp:

2010-10-23T16:04:12Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c77b4d6

Parents:

84c20da (diff), 58b833c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/srv

Files:

• devman/Makefile (moved) (moved from uspace/lib/pci/Makefile ) (1 diff)
• devman/devman.c (added)
• devman/devman.h (added)
• devman/main.c (added)
• devman/match.c (added)
• devman/util.c (added)
• devman/util.h (added)
• fs/fat/fat_ops.c (modified) (4 diffs)
• hw/bus/pci/pci.c (deleted)
• hw/bus/pci/update-ids (deleted)
• net/tl/tcp/tcp.c (modified) (1 diff)
• vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/devman/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBRARY = libpci
+BINARY = devman
 
 SOURCES = \
-        access.c \
-        generic.c \
-        names.c \
-        i386-ports.c
+        main.c \
+        devman.c \
+        match.c \
+        util.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/fs/fat/fat_ops.c

@@ -369 +369 @@
         unsigned blocks;
         fat_dentry_t *d;
+        dev_handle_t dev_handle;
         block_t *b;
         int rc;
 
         fibril_mutex_lock(&parentp->idx->lock);
-        bs = block_bb_get(parentp->idx->dev_handle);
+        dev_handle = parentp->idx->dev_handle;
+        fibril_mutex_unlock(&parentp->idx->lock);
+
+        bs = block_bb_get(dev_handle);
         blocks = parentp->size / BPS(bs);
         for (i = 0; i < blocks; i++) {
                 rc = fat_block_get(&b, bs, parentp, i, BLOCK_FLAGS_NONE);
-                if (rc != EOK) {
-                        fibril_mutex_unlock(&parentp->idx->lock);
+                if (rc != EOK)
                         return rc;
-                }
                 for (j = 0; j < DPS(bs); j++) { 
                         d = ((fat_dentry_t *)b->data) + j;
@@ -390 +392 @@
                                 /* miss */
                                 rc = block_put(b);
-                                fibril_mutex_unlock(&parentp->idx->lock);
                                 *rfn = NULL;
                                 return rc;
@@ -401 +402 @@
                                 /* hit */
                                 fat_node_t *nodep;
-                                /*
-                                 * Assume tree hierarchy for locking.  We
-                                 * already have the parent and now we are going
-                                 * to lock the child.  Never lock in the oposite
-                                 * order.
-                                 */
-                                fat_idx_t *idx = fat_idx_get_by_pos(
-                                    parentp->idx->dev_handle, parentp->firstc,
-                                    i * DPS(bs) + j);
-                                fibril_mutex_unlock(&parentp->idx->lock);
+                                fat_idx_t *idx = fat_idx_get_by_pos(dev_handle,
+                                    parentp->firstc, i * DPS(bs) + j);
                                 if (!idx) {
                                         /*
@@ -433 +426 @@
                 }
                 rc = block_put(b);
-                if (rc != EOK) {
-                        fibril_mutex_unlock(&parentp->idx->lock);
+                if (rc != EOK)
                         return rc;
-                }
-        }
-
-        fibril_mutex_unlock(&parentp->idx->lock);
+        }
+
         *rfn = NULL;
         return EOK;

uspace/srv/net/tl/tcp/tcp.c

@@ -2033 +2033 @@
         if (!fibril) {
                 free(operation_timeout);
-                return EPARTY;
+                return EPARTY;  /* FIXME: use another EC */
         }
 //      fibril_mutex_lock(&socket_data->operation.mutex);

uspace/srv/vfs/vfs_ops.c

@@ -1355 +1355 @@
                 int ret = vfs_close_internal(newfile);
                 if (ret != EOK) {
+                        fibril_mutex_unlock(&oldfile->lock);
                         ipc_answer_0(rid, ret);
                         return;
@@ -1361 +1362 @@
                 ret = vfs_fd_free(newfd);
                 if (ret != EOK) {
+                        fibril_mutex_unlock(&oldfile->lock);
                         ipc_answer_0(rid, ret);
                         return;