Changeset 796c276 in mainline for uspace/srv/fs/ext2fs/ext2fs.c

Timestamp:

2011-03-03T20:12:36Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

163cf12

Parents:

9ffbdf1

Message:

Renamed ext2 server to ext2fs so its namespace won't collide with libext2. (+Small bits of other code in ext2fs server)

File:

• uspace/srv/fs/ext2fs/ext2fs.c (moved) (moved from uspace/srv/fs/ext2/ext2.c ) (6 diffs)

uspace/srv/fs/ext2fs/ext2fs.c

@@ -37 +37 @@
  */
 
-#include "ext2.h"
+#include "ext2fs.h"
 #include <ipc/services.h>
 #include <ipc/ns.h>
@@ -48 +48 @@
 #include "../../vfs/vfs.h"
 
-#define NAME    "ext2"
+#define NAME    "ext2fs"
 
-vfs_info_t ext2_vfs_info = {
+vfs_info_t ext2fs\_vfs_info = {
         .name = NAME,
 };
 
-fs_reg_t ext2_reg;
+fs_reg_t ext2fs_reg;
 
 /**
@@ -62 +62 @@
  * The connection fibril accepts VFS requests from VFS. If there is only one
  * instance of the fibril, VFS will need to serialize all VFS requests it sends
- * to EXT2. To overcome this bottleneck, VFS can send EXT2 the IPC_M_CONNECT_ME_TO
+ * to EXT2FS. To overcome this bottleneck, VFS can send EXT2FS the IPC_M_CONNECT_ME_TO
  * call. In that case, a new connection fibril will be created, which in turn
  * will accept the call. Thus, a new phone will be opened for VFS.
@@ -68 +68 @@
  * There are few issues with this arrangement. First, VFS can run out of
  * available phones. In that case, VFS can close some other phones or use one
- * phone for more serialized requests. Similarily, EXT2 can refuse to duplicate
+ * phone for more serialized requests. Similarily, EXT2FS can refuse to duplicate
  * the connection. VFS should then just make use of already existing phones and
  * route its requests through them. To avoid paying the fibril creation price 
- * upon each request, EXT2 might want to keep the connections open after the
+ * upon each request, EXT2FS might want to keep the connections open after the
  * request has been completed.
  */
@@ -95 +95 @@
                         return;
                 case VFS_OUT_MOUNTED:
-                        ext2_mounted(callid, &call);
+                        ext2fs_mounted(callid, &call);
                         break;
                 case VFS_OUT_MOUNT:
-                        ext2_mount(callid, &call);
+                        ext2fs_mount(callid, &call);
                         break;
                 case VFS_OUT_UNMOUNTED:
-                        ext2_unmounted(callid, &call);
+                        ext2fs_unmounted(callid, &call);
                         break;
                 case VFS_OUT_UNMOUNT:
-                        ext2_unmount(callid, &call);
+                        ext2fs_unmount(callid, &call);
                         break;
                 case VFS_OUT_LOOKUP:
-                        ext2_lookup(callid, &call);
+                        ext2fs_lookup(callid, &call);
                         break;
                 case VFS_OUT_READ:
-                        ext2_read(callid, &call);
+                        ext2fs_read(callid, &call);
                         break;
                 case VFS_OUT_WRITE:
-                        ext2_write(callid, &call);
+                        ext2fs_write(callid, &call);
                         break;
                 case VFS_OUT_TRUNCATE:
-                        ext2_truncate(callid, &call);
+                        ext2fs_truncate(callid, &call);
                         break;
                 case VFS_OUT_STAT:
-                        ext2_stat(callid, &call);
+                        ext2fs_stat(callid, &call);
                         break;
                 case VFS_OUT_CLOSE:
-                        ext2_close(callid, &call);
+                        ext2fs_close(callid, &call);
                         break;
                 case VFS_OUT_DESTROY:
-                        ext2_destroy(callid, &call);
+                        ext2fs_destroy(callid, &call);
                         break;
                 case VFS_OUT_OPEN_NODE:
-                        ext2_open_node(callid, &call);
+                        ext2fs_open_node(callid, &call);
                         break;
                 case VFS_OUT_SYNC:
-                        ext2_sync(callid, &call);
+                        ext2fs_sync(callid, &call);
                         break;
                 default:
@@ -153 +153 @@
         }
         
-        rc = fs_register(vfs_phone, &ext2_reg, &ext2_vfs_info, ext2_connection);
+        rc = fs_register(vfs_phone, &ext2fs_reg, &ext2fs_vfs_info, ext2_connection);
         
         printf(NAME ": Accepting connections\n");