Changeset d42976c in mainline for uspace/srv/fs/fat/fat_idx.c

Timestamp:

2010-02-04T20:14:20Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

19f24fd, a281fc82

Parents:

4cac2d69 (diff), 393bef1 (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 fixes from the file system branch.
In particular, prevent mounting the same TMPFS file system instance twice for
now as the proper support will require some tweaking.

File:

• uspace/srv/fs/fat/fat_idx.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_idx.c

@@ -164 +164 @@
                 assert((keys == 1) || (keys == 3));
         }
+
+        return 0;
 }
 
@@ -219 +221 @@
                 assert((keys == 1) || (keys == 2));
         }
+
+        return 0;
 }