Changeset 8b1ea2d4 in mainline

Timestamp:

2011-02-16T23:15:48Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b927375, c4fb95d3

Parents:

0c968a17 (diff), cfd630af (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 from lp:~jakub/helenos/fs.

Location:

uspace

Files:

• lib/block/libblock.c (modified) (1 diff)
• srv/fs/devfs/devfs_ops.c (modified) (1 diff)

uspace/lib/block/libblock.c

@@ -626 +626 @@
                         unsigned long key = block->lba;
                         hash_table_remove(&cache->block_hash, &key, 1);
+                        fibril_mutex_unlock(&block->lock);
                         free(block->data);
                         free(block);

uspace/srv/fs/devfs/devfs_ops.c

@@ -278 +278 @@
                                 fibril_mutex_unlock(&devices_mutex);
 
-                                free(dev);
                                 return ENOENT;
                         }