Changes in / [d42976c:4cac2d69] in mainline

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;
 }
 
@@ -221 +219 @@
                 assert((keys == 1) || (keys == 2));
         }
-
-        return 0;
 }
 

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -168 +168 @@
                     (nodep->index == key[NODES_KEY_INDEX]));
         default:
-                assert((keys == 1) || (keys == 2));
-        }
-
-        return 0;
+                abort();
+        }
 }
 
@@ -441 +439 @@
 {
         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;
-        rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
+        int 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;
         }
@@ -468 +456 @@
         }
 
+        fs_node_t *rootfn;
         rc = tmpfs_root_get(&rootfn, dev_handle);
         assert(rc == EOK);