Changeset 6f9ef87a in mainline

Timestamp:

2011-11-05T23:35:47Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

4af2f36

Parents:

6b8e5b7

Message:

Do not add the fs to the mtab list if vfs_mount_internal() failed.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (13 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -73 +73 @@
 };
 
-static void vfs_mount_internal(ipc_callid_t rid, service_id_t service_id,
+static int vfs_mount_internal(ipc_callid_t rid, service_id_t service_id,
     fs_handle_t fs_handle, char *mp, char *opts)
 {
@@ -96 +96 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, EBUSY);
-                        return;
+                        return EBUSY;
                 }
                 
@@ -104 +104 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, rc);
-                        return;
+                        return rc;
                 }
                 
@@ -111 +111 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, ENOMEM);
-                        return;
+                        return ENOMEM;
                 }
                 
@@ -140 +140 @@
                                 fibril_rwlock_write_unlock(&namespace_rwlock);
                                 async_answer_0(rid, rc);
-                                return;
+                                return rc;
                         }
                         async_wait_for(msg, &rc);
@@ -147 +147 @@
                                 fibril_rwlock_write_unlock(&namespace_rwlock);
                                 async_answer_0(rid, rc);
-                                return;
+                                return rc;
                         }
 
@@ -171 +171 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, rc);
-                        return;
+                        return rc;
                 } else {
                         /*
@@ -179 +179 @@
                         fibril_rwlock_write_unlock(&namespace_rwlock);
                         async_answer_0(rid, ENOENT);
-                        return;
+                        return ENOENT;
                 }
         }
@@ -212 +212 @@
                 async_answer_0(rid, rc);
                 fibril_rwlock_write_unlock(&namespace_rwlock);
-                return;
+                return rc;
         }
         
@@ -227 +227 @@
                 fibril_rwlock_write_unlock(&namespace_rwlock);
                 async_answer_0(rid, rc);
-                return;
+                return rc;
         }
         
@@ -263 +263 @@
         async_answer_0(rid, rc);
         fibril_rwlock_write_unlock(&namespace_rwlock);
+        return rc;
 }
 
@@ -357 +358 @@
         }
         fibril_mutex_unlock(&fs_list_lock);
-        
+
+        /* Do the mount */
+        rc = vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
+        if (rc != EOK) {
+                async_answer_0(callid, ENOTSUP);
+                async_answer_0(rid, ENOTSUP);
+                free(mp);
+                free(opts);
+                free(fs_name);
+                return;
+        }
+
         /* Add the filesystem info to the list of mounted filesystems */
         mtab_ent_t *mtab_ent = malloc(sizeof(mtab_ent_t));
@@ -381 +393 @@
         mtab_size++;
         fibril_mutex_unlock(&mtab_list_lock);
-
-        /* Do the mount */
-        vfs_mount_internal(rid, service_id, fs_handle, mp, opts);
 
         free(mp);