Changeset 00aece0 in mainline for uspace/lib/c/include/vfs/vfs_mtab.h

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/lib/c/include/vfs/vfs_mtab.h (moved) (moved from uspace/lib/c/include/ns_obsolete.h ) (2 diffs)

uspace/lib/c/include/vfs/vfs_mtab.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2011 Maurizio Lombardi
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#ifndef LIBC_NS_OBSOLETE_H_
-#define LIBC_NS_OBSOLETE_H_
+#ifndef LIBC_VFS_MTAB_H_
+#define LIBC_VFS_MTAB_H_
 
 #include <sys/types.h>
-#include <task.h>
+#include <ipc/vfs.h>
+#include <adt/list.h>
 
-extern int service_obsolete_connect(sysarg_t, sysarg_t, sysarg_t);
-extern int service_obsolete_connect_blocking(sysarg_t, sysarg_t,
-    sysarg_t);
+typedef struct mtab_ent {
+        link_t link;
+        char mp[MAX_PATH_LEN];
+        char opts[MAX_MNTOPTS_LEN];
+        char fs_name[FS_NAME_MAXLEN];
+        unsigned int instance;
+        service_id_t service_id;
+} mtab_ent_t;
 
 #endif