Changeset 852b801 in mainline for uspace/srv/vfs

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/vfs

Files:

• vfs.c (modified) (2 diffs)
• vfs.h (modified) (2 diffs)
• vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs.c

@@ -108 +108 @@
                         vfs_truncate(callid, &call);
                         break;
+                case VFS_IN_FSTAT:
+                        vfs_fstat(callid, &call);
+                        break;
+                case VFS_IN_STAT:
+                        vfs_stat(callid, &call);
+                        break;
                 case VFS_IN_MKDIR:
                         vfs_mkdir(callid, &call);
@@ -117 +123 @@
                         vfs_rename(callid, &call);
                         break;
-                case VFS_IN_DEVICE:
-                        vfs_device(callid, &call);
-                        break;
                 case VFS_IN_SYNC:
                         vfs_sync(callid, &call);
-                        break;
-                case VFS_IN_NODE:
-                        vfs_node(callid, &call);
                         break;
                 default:

uspace/srv/vfs/vfs.h

@@ -199 +199 @@
 extern void vfs_open(ipc_callid_t, ipc_call_t *);
 extern void vfs_open_node(ipc_callid_t, ipc_call_t *);
-extern void vfs_device(ipc_callid_t, ipc_call_t *);
 extern void vfs_sync(ipc_callid_t, ipc_call_t *);
-extern void vfs_node(ipc_callid_t, ipc_call_t *);
 extern void vfs_close(ipc_callid_t, ipc_call_t *);
 extern void vfs_read(ipc_callid_t, ipc_call_t *);
@@ -207 +205 @@
 extern void vfs_seek(ipc_callid_t, ipc_call_t *);
 extern void vfs_truncate(ipc_callid_t, ipc_call_t *);
+extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
+extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
+extern void vfs_stat(ipc_callid_t, ipc_call_t *);
 extern void vfs_mkdir(ipc_callid_t, ipc_call_t *);
 extern void vfs_unlink(ipc_callid_t, ipc_call_t *);

uspace/srv/vfs/vfs_ops.c

@@ -642 +642 @@
 }
 
-void vfs_node(ipc_callid_t rid, ipc_call_t *request)
-{
-        int fd = IPC_GET_ARG1(*request);
-        
-        /* Lookup the file structure corresponding to the file descriptor. */
-        vfs_file_t *file = vfs_file_get(fd);
-        if (!file) {
-                ipc_answer_0(rid, ENOENT);
-                return;
-        }
-        
-        ipc_answer_3(rid, EOK, file->node->fs_handle, file->node->dev_handle,
-            file->node->index);
-}
-
-void vfs_device(ipc_callid_t rid, ipc_call_t *request)
-{
-        int fd = IPC_GET_ARG1(*request);
-        
-        /* Lookup the file structure corresponding to the file descriptor. */
-        vfs_file_t *file = vfs_file_get(fd);
-        if (!file) {
-                ipc_answer_0(rid, ENOENT);
-                return;
-        }
-        
-        /*
-         * Lock the open file structure so that no other thread can manipulate
-         * the same open file at a time.
-         */
-        fibril_mutex_lock(&file->lock);
-        int fs_phone = vfs_grab_phone(file->node->fs_handle);
-        
-        /* Make a VFS_OUT_DEVICE request at the destination FS server. */
-        aid_t msg;
-        ipc_call_t answer;
-        msg = async_send_2(fs_phone, VFS_OUT_DEVICE, file->node->dev_handle,
-            file->node->index, &answer);
-
-        /* Wait for reply from the FS server. */
-        ipcarg_t rc;
-        async_wait_for(msg, &rc);
-
-        vfs_release_phone(fs_phone);
-        fibril_mutex_unlock(&file->lock);
-        
-        ipc_answer_1(rid, EOK, IPC_GET_ARG1(answer));
-}
-
 void vfs_sync(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -975 +926 @@
         fibril_mutex_unlock(&file->lock);
         ipc_answer_0(rid, (ipcarg_t)rc);
+}
+
+void vfs_fstat(ipc_callid_t rid, ipc_call_t *request)
+{
+        int fd = IPC_GET_ARG1(*request);
+        size_t size = IPC_GET_ARG2(*request);
+        ipcarg_t rc;
+
+        vfs_file_t *file = vfs_file_get(fd);
+        if (!file) {
+                ipc_answer_0(rid, ENOENT);
+                return;
+        }
+
+        ipc_callid_t callid;
+        if (!ipc_data_read_receive(&callid, NULL)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        fibril_mutex_lock(&file->lock);
+
+        int fs_phone = vfs_grab_phone(file->node->fs_handle);
+        
+        aid_t msg;
+        msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->dev_handle,
+            file->node->index, true, NULL);
+        ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        async_wait_for(msg, &rc);
+        vfs_release_phone(fs_phone);
+
+        fibril_mutex_unlock(&file->lock);
+        ipc_answer_0(rid, rc);
+}
+
+void vfs_stat(ipc_callid_t rid, ipc_call_t *request)
+{
 }