Changeset d2c8533 in mainline for uspace/lib

Timestamp:

2017-05-08T20:38:47Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f066a87

Parents:

582a0b8

Message:

File system probing groundwork. Only MFS can do it for now.

Location:

uspace/lib

Files:

• c/generic/vfs/vfs.c (modified) (1 diff)
• c/include/ipc/vfs.h (modified) (3 diffs)
• c/include/vfs/vfs.h (modified) (1 diff)
• fs/libfs.c (modified) (2 diffs)
• fs/libfs.h (modified) (1 diff)

uspace/lib/c/generic/vfs/vfs.c

@@ -347 +347 @@
         return loc_service_connect(stat.service, iface, 0);
 }
+
+/** Determine if a device contains the specified file system type. If so,
+ * return identification information.
+ *
+ * @param fs_name File system name
+ * @param serv    Service representing the mountee
+ * @param info    Place to store volume identification information
+ *
+ * @return                      EOK on success or a negative error code
+ */
+int vfs_fsprobe(const char *fs_name, service_id_t serv,
+    vfs_fs_probe_info_t *info)
+{
+        sysarg_t rc;
+        
+        ipc_call_t answer;
+        async_exch_t *exch = vfs_exchange_begin();
+        aid_t req = async_send_1(exch, VFS_IN_FSPROBE, serv, &answer);
+        
+        rc = async_data_write_start(exch, (void *) fs_name,
+            str_size(fs_name));
+        
+        async_wait_for(req, &rc);
+        
+        if (rc != EOK) {
+                vfs_exchange_end(exch);
+                return rc;
+        }
+        
+        rc = async_data_read_start(exch, info, sizeof(*info));
+        vfs_exchange_end(exch);
+        
+        return rc;
+}
+
 
 /** Return a list of currently available file system types

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

@@ -41 +41 @@
 
 #define FS_NAME_MAXLEN  20
+#define FS_LABEL_MAXLEN 256
+#define FS_VUID_MAXLEN 128
 #define MAX_PATH_LEN    (32 * 1024)
 #define MAX_MNTOPTS_LEN 256
@@ -62 +64 @@
 } vfs_info_t;
 
+/** Data returned by filesystem probe regarding a specific volume. */
+typedef struct {
+        char label[FS_LABEL_MAXLEN + 1];
+        char vuid[FS_VUID_MAXLEN + 1];
+} vfs_fs_probe_info_t;
+
 typedef enum {
         VFS_IN_CLONE = IPC_FIRST_USER_METHOD,
+        VFS_IN_FSPROBE,
         VFS_IN_FSTYPES,
         VFS_IN_MOUNT,
@@ -85 +94 @@
         VFS_OUT_CLOSE = IPC_FIRST_USER_METHOD,
         VFS_OUT_DESTROY,
+        VFS_OUT_FSPROBE,
         VFS_OUT_IS_EMPTY,
         VFS_OUT_LINK,

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

@@ -88 +88 @@
 extern async_exch_t *vfs_exchange_begin(void);
 extern void vfs_exchange_end(async_exch_t *);
+extern int vfs_fsprobe(const char *, service_id_t, vfs_fs_probe_info_t *);
 extern int vfs_fstypes(vfs_fstypes_t *);
 extern void vfs_fstypes_free(vfs_fstypes_t *);

uspace/lib/fs/libfs.c

@@ -81 +81 @@
     ipc_call_t *);
 
+static void vfs_out_fsprobe(ipc_callid_t rid, ipc_call_t *req)
+{
+        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
+        int rc;
+        vfs_fs_probe_info_t info;
+        
+        ipc_callid_t callid;
+        size_t size;
+        if ((!async_data_read_receive(&callid, &size)) ||
+            (size != sizeof(info))) {
+                async_answer_0(callid, EIO);
+                async_answer_0(rid, EIO);
+                return;
+        }
+        
+        memset(&info, 0, sizeof(info));
+        rc = vfs_out_ops->fsprobe(service_id, &info);
+        if (rc != EOK) {
+                async_answer_0(callid, EIO);
+                async_answer_0(rid, rc);
+                return;
+        }
+        
+        async_data_read_finalize(callid, &info, sizeof(info));
+        async_answer_0(rid, EOK);
+}
+
 static void vfs_out_mounted(ipc_callid_t rid, ipc_call_t *req)
 {
@@ -272 +299 @@
                 
                 switch (IPC_GET_IMETHOD(call)) {
+                case VFS_OUT_FSPROBE:
+                        vfs_out_fsprobe(callid, &call);
+                        break;
                 case VFS_OUT_MOUNTED:
                         vfs_out_mounted(callid, &call);

uspace/lib/fs/libfs.h

@@ -43 +43 @@
 
 typedef struct {
+        int (* fsprobe)(service_id_t, vfs_fs_probe_info_t *);
         int (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *,
             unsigned *);