Changeset d42976c in mainline

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.

Location:

uspace/srv/fs

Files:

• fat/fat_idx.c (modified) (2 diffs)
• tmpfs/tmpfs_ops.c (modified) (3 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;
 }
 

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -168 +168 @@
                     (nodep->index == key[NODES_KEY_INDEX]));
         default:
-                abort();
-        }
+                assert((keys == 1) || (keys == 2));
+        }
+
+        return 0;
 }
 
@@ -439 +441 @@
 {
         dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        fs_node_t *rootfn;
+        int rc;
         
-        /* Accept the mount options */
+        /* Accept the mount options. */
         char *opts;
-        int rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
-        
+        rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 ipc_answer_0(rid, rc);
+                return;
+        }
+
+        /* Check if this device is not already mounted. */
+        rc = tmpfs_root_get(&rootfn, dev_handle);
+        if ((rc == EOK) && (rootfn)) {
+                (void) tmpfs_node_put(rootfn);
+                free(opts);
+                ipc_answer_0(rid, EEXIST);
                 return;
         }
@@ -456 +468 @@
         }
 
-        fs_node_t *rootfn;
         rc = tmpfs_root_get(&rootfn, dev_handle);
         assert(rc == EOK);