Changeset db6e419 in mainline for uspace/srv/fs/locfs/locfs.c

Timestamp:

2011-08-16T18:53:00Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

49160c4

Parents:

e0e922d (diff), 45058baa (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/locfs/locfs.c (moved) (moved from uspace/srv/fs/devfs/devfs.c ) (4 diffs)

uspace/srv/fs/locfs/locfs.c

@@ -32 +32 @@
 
 /**
- * @file devfs.c
- * @brief Devices file system.
+ * @file locfs.c
+ * @brief Location-service file system.
  *
- * Every device registered to device mapper is represented as a file in this
+ * Every service registered with location service is represented as a file in this
  * file system.
  */
@@ -46 +46 @@
 #include <task.h>
 #include <libfs.h>
-#include "devfs.h"
-#include "devfs_ops.h"
+#include "locfs.h"
+#include "locfs_ops.h"
 
-#define NAME  "devfs"
+#define NAME  "locfs"
 
-static vfs_info_t devfs_vfs_info = {
+static vfs_info_t locfs_vfs_info = {
         .name = NAME,
         .concurrent_read_write = false,
@@ -61 +61 @@
         printf("%s: HelenOS Device Filesystem\n", NAME);
         
-        if (!devfs_init()) {
-                printf("%s: failed to initialize devfs\n", NAME);
+        if (!locfs_init()) {
+                printf("%s: failed to initialize locfs\n", NAME);
                 return -1;
         }
@@ -73 +73 @@
         }
         
-        int rc = fs_register(vfs_sess, &devfs_vfs_info, &devfs_ops,
-            &devfs_libfs_ops);
+        int rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops,
+            &locfs_libfs_ops);
         if (rc != EOK) {
                 printf("%s: Failed to register file system (%d)\n", NAME, rc);