Changeset 4c53333 in mainline for uspace/srv/fs/ext4fs/ext4fs.c

Timestamp:

2013-07-11T08:21:10Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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 mainline changes

File:

• uspace/srv/fs/ext4fs/ext4fs.c (moved) (moved from uspace/srv/fs/ext2fs/ext2fs.c ) (4 diffs)

uspace/srv/fs/ext4fs/ext4fs.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
- * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2012 Frantisek Princ
  * All rights reserved.
  *
@@ -30 +29 @@
 /** @addtogroup fs
  * @{
- */ 
-
+ */
 /**
- * @file        ext2.c
- * @brief       EXT2 file system driver for HelenOS.
+ * @file  ext4fs.c
+ * @brief Ext4 file system driver for HelenOS.
  */
 
-#include "ext2fs.h"
-#include <ipc/services.h>
-#include <ns.h>
 #include <async.h>
 #include <errno.h>
-#include <unistd.h>
+#include <libfs.h>
+#include <ns.h>
+#include <stdio.h>
 #include <task.h>
-#include <stdio.h>
-#include <libfs.h>
+#include <ipc/services.h>
+#include "ext4fs.h"
 #include "../../vfs/vfs.h"
 
-#define NAME    "ext2fs"
+#define NAME  "ext4fs"
 
-vfs_info_t ext2fs_vfs_info = {
+vfs_info_t ext4fs_vfs_info = {
         .name = NAME,
-        .instance = 0,
+        .instance = 0
 };
 
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS EXT2 file system server\n");
-
+        printf("%s: HelenOS ext4 file system server\n", NAME);
+        
         if (argc == 3) {
                 if (!str_cmp(argv[1], "--instance"))
-                        ext2fs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                        ext4fs_vfs_info.instance = strtol(argv[2], NULL, 10);
                 else {
-                        printf(NAME " Unrecognized parameters");
-                        return -1;
+                        printf("%s: Unrecognized parameters\n", NAME);
+                        return 1;
                 }
         }
@@ -71 +68 @@
             SERVICE_VFS, 0, 0);
         if (!vfs_sess) {
-                printf(NAME ": failed to connect to VFS\n");
-                return -1;
-        }
-
-        int rc = ext2fs_global_init();
-        if (rc != EOK) {
-                printf(NAME ": Failed global initialization\n");
-                return 1;
-        }       
-                
-        rc = fs_register(vfs_sess, &ext2fs_vfs_info, &ext2fs_ops,
-            &ext2fs_libfs_ops);
-        if (rc != EOK) {
-                fprintf(stdout, NAME ": Failed to register fs (%d)\n", rc);
-                return 1;
+                printf("%s: Failed to connect to VFS\n", NAME);
+                return 2;
         }
         
-        printf(NAME ": Accepting connections\n");
+        int rc = ext4fs_global_init();
+        if (rc != EOK) {
+                printf("%s: Global initialization failed\n", NAME);
+                return rc;
+        }
+        
+        rc = fs_register(vfs_sess, &ext4fs_vfs_info, &ext4fs_ops,
+            &ext4fs_libfs_ops);
+        if (rc != EOK) {
+                printf("%s: Failed to register file system\n", NAME);
+                return rc;
+        }
+        
+        printf("%s: Accepting connections\n", NAME);
         task_retval(0);
         async_manager();
-        /* not reached */
+        
+        /* Not reached */
         return 0;
 }
@@ -97 +95 @@
 /**
  * @}
- */ 
+ */