Changeset 852b801 in mainline for uspace/srv/fs

Timestamp:

2009-06-28T18:59:02Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

75160a6

Parents:

4198f9c3

Message:

Introduce VFS_IN_FSTAT and VFS_OUT_STAT.
Provide libc fstat() and devfs_stat().
This functionality replaces VFS_IN_NODE
and VFS_IN/OUT_DEVICE. FAT and TMPFS
still do not implement this and VFS_IN_STAT
and stat() need implementation as well.

Location:

uspace/srv/fs

Files:

• devfs/devfs.c (modified) (1 diff)
• devfs/devfs_ops.c (modified) (3 diffs)
• devfs/devfs_ops.h (modified) (1 diff)
• fat/fat.c (modified) (2 diffs)
• fat/fat.h (modified) (1 diff)
• fat/fat_ops.c (modified) (1 diff)
• tmpfs/tmpfs.c (modified) (1 diff)
• tmpfs/tmpfs.h (modified) (1 diff)
• tmpfs/tmpfs_ops.c (modified) (1 diff)

uspace/srv/fs/devfs/devfs.c

@@ -80 +80 @@
                         devfs_open_node(callid, &call);
                         break;
-                case VFS_OUT_DEVICE:
-                        devfs_device(callid, &call);
+                case VFS_OUT_STAT:
+                        devfs_stat(callid, &call);
                         break;
                 case VFS_OUT_READ:

uspace/srv/fs/devfs/devfs_ops.c

@@ -44 +44 @@
 #include <fibril_sync.h>
 #include <adt/hash_table.h>
+#include <sys/stat.h>
 #include "devfs.h"
 #include "devfs_ops.h"
@@ -278 +279 @@
 }
 
-void devfs_device(ipc_callid_t rid, ipc_call_t *request)
-{
+void devfs_stat(ipc_callid_t rid, ipc_call_t *request)
+{
+        dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
+        
+        ipc_callid_t callid;
+        size_t size;
+        if (!ipc_data_read_receive(&callid, &size) ||
+            size < sizeof(struct stat)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        struct stat *stat = malloc(sizeof(struct stat));
+        if (!stat) {
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
+                return;
+        }
+        memset(stat, 0, sizeof(struct stat));
+
+        stat->fs_handle = devfs_reg.fs_handle;
+        stat->dev_handle = dev_handle;
+        stat->index = index;
+        stat->lnkcnt = 1;
+        stat->is_file = (index != 0);
+        stat->size = 0;
         
         if (index != 0) {
@@ -289 +315 @@
                 fibril_mutex_lock(&devices_mutex);
                 link_t *lnk = hash_table_find(&devices, key);
-                if (lnk == NULL) {
-                        fibril_mutex_unlock(&devices_mutex);
-                        ipc_answer_0(rid, ENOENT);
-                        return;
-                }
+                if (lnk != NULL) 
+                        stat->devfs_stat.device = (dev_handle_t)index;
                 fibril_mutex_unlock(&devices_mutex);
-                
-                ipc_answer_1(rid, EOK, (ipcarg_t) index);
-        } else
-                ipc_answer_0(rid, ENOTSUP);
+        }
+
+        ipc_data_read_finalize(callid, stat, sizeof(struct stat));
+        ipc_answer_0(rid, EOK);
+
+        free(stat);
 }
 

uspace/srv/fs/devfs/devfs_ops.h

@@ -43 +43 @@
 extern void devfs_lookup(ipc_callid_t, ipc_call_t *);
 extern void devfs_open_node(ipc_callid_t, ipc_call_t *);
-extern void devfs_device(ipc_callid_t, ipc_call_t *);
+extern void devfs_stat(ipc_callid_t, ipc_call_t *);
 extern void devfs_sync(ipc_callid_t, ipc_call_t *);
 extern void devfs_read(ipc_callid_t, ipc_call_t *);

uspace/srv/fs/fat/fat.c

@@ -110 +110 @@
                         fat_truncate(callid, &call);
                         break;
+                case VFS_OUT_STAT:
+                        fat_stat(callid, &call);
+                        break;
                 case VFS_OUT_CLOSE:
                         fat_close(callid, &call);
@@ -118 +121 @@
                 case VFS_OUT_OPEN_NODE:
                         fat_open_node(callid, &call);
-                        break;
-                case VFS_OUT_DEVICE:
-                        fat_device(callid, &call);
                         break;
                 case VFS_OUT_SYNC:

uspace/srv/fs/fat/fat.h

@@ -208 +208 @@
 extern void fat_write(ipc_callid_t, ipc_call_t *);
 extern void fat_truncate(ipc_callid_t, ipc_call_t *);
+extern void fat_stat(ipc_callid_t, ipc_call_t *);
 extern void fat_close(ipc_callid_t, ipc_call_t *);
 extern void fat_destroy(ipc_callid_t, ipc_call_t *);
 extern void fat_open_node(ipc_callid_t, ipc_call_t *);
-extern void fat_device(ipc_callid_t, ipc_call_t *);
+extern void fat_stat(ipc_callid_t, ipc_call_t *);
 extern void fat_sync(ipc_callid_t, ipc_call_t *);
 

uspace/srv/fs/fat/fat_ops.c

@@ -1203 +1203 @@
 }
 
-void fat_device(ipc_callid_t rid, ipc_call_t *request)
+void fat_stat(ipc_callid_t rid, ipc_call_t *request)
 {
         ipc_answer_0(rid, ENOTSUP);

uspace/srv/fs/tmpfs/tmpfs.c

@@ -126 +126 @@
                         tmpfs_open_node(callid, &call);
                         break;
-                case VFS_OUT_DEVICE:
-                        tmpfs_device(callid, &call);
+                case VFS_OUT_STAT:
+                        tmpfs_stat(callid, &call);
                         break;
                 case VFS_OUT_SYNC:

uspace/srv/fs/tmpfs/tmpfs.h

@@ -87 +87 @@
 extern void tmpfs_write(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_truncate(ipc_callid_t, ipc_call_t *);
+extern void tmpfs_stat(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_close(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_destroy(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_open_node(ipc_callid_t, ipc_call_t *);
-extern void tmpfs_device(ipc_callid_t, ipc_call_t *);
 extern void tmpfs_sync(ipc_callid_t, ipc_call_t *);
 

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -629 +629 @@
 }
 
-void tmpfs_device(ipc_callid_t rid, ipc_call_t *request)
+void tmpfs_stat(ipc_callid_t rid, ipc_call_t *request)
 {
         ipc_answer_0(rid, ENOTSUP);