WebSVN – HelenOS – Diff – /branches/network/uspace/srv/vfs/vfs_ops.c

 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <bool.h>
-#include <futex.h>
-#include <rwlock.h>
+#include <fibril_sync.h>
-#include <libadt/list.h>
+#include <adt/list.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <assert.h>
 #include <vfs/canonify.h>
 /* Forward declarations of static functions. */
 static int vfs_truncate_internal(fs_handle_t, dev_handle_t, fs_index_t, size_t);
-/** Pending mount structure. */
-typedef struct {
-    link_t link;
-    char *fs_name;            /**< File system name */
-    char *mp;                 /**< Mount point */
-    char *opts;       /**< Mount options. */
-    ipc_callid_t callid;      /**< Call ID waiting for the mount */
-    ipc_callid_t rid;         /**< Request ID */
-    dev_handle_t dev_handle;  /**< Device handle */
-} pending_req_t;
-LIST_INITIALIZE(pending_req);
 /**
  * This rwlock prevents the race between a triplet-to-VFS-node resolution and a
  * concurrent VFS operation which modifies the file system namespace.
  */
-RWLOCK_INITIALIZE(namespace_rwlock);
+FIBRIL_RWLOCK_INITIALIZE(namespace_rwlock);
-futex_t rootfs_futex = FUTEX_INITIALIZER;
 vfs_pair_t rootfs = {
     .fs_handle = 0,
     .dev_handle = 0
 };
 static void vfs_mount_internal(ipc_callid_t rid, dev_handle_t dev_handle,
     fs_handle_t fs_handle, char *mp, char *opts)
+{
     vfs_lookup_res_t mp_res;
+    vfs_lookup_res_t mr_res;
     vfs_node_t *mp_node = NULL;
+    vfs_node_t *mr_node;
+    fs_index_t rindex;
+    size_t rsize;
+    unsigned rlnkcnt;
     ipcarg_t rc;
     int phone;
     aid_t msg;
     ipc_call_t answer;
     /* Resolve the path to the mountpoint. */
-    futex_down(&rootfs_futex);
+    fibril_rwlock_write_lock(&namespace_rwlock);
     if (rootfs.fs_handle) {
         /* We already have the root FS. */
-        rwlock_write_lock(&namespace_rwlock);
         if (str_cmp(mp, "/") == 0) {
             /* Trying to mount root FS over root FS */
-            rwlock_write_unlock(&namespace_rwlock);
+            fibril_rwlock_write_unlock(&namespace_rwlock);
-            futex_up(&rootfs_futex);
             ipc_answer_0(rid, EBUSY);
             return;
+        }
         rc = vfs_lookup_internal(mp, L_DIRECTORY, &mp_res, NULL);
         if (rc != EOK) {
             /* The lookup failed for some reason. */
-            rwlock_write_unlock(&namespace_rwlock);
+            fibril_rwlock_write_unlock(&namespace_rwlock);
-            futex_up(&rootfs_futex);
             ipc_answer_0(rid, rc);
             return;
+        }
         mp_node = vfs_node_get(&mp_res);
         if (!mp_node) {
-            rwlock_write_unlock(&namespace_rwlock);
+            fibril_rwlock_write_unlock(&namespace_rwlock);
-            futex_up(&rootfs_futex);
             ipc_answer_0(rid, ENOMEM);
             return;
+        }
         /*
          * Now we hold a reference to mp_node.
          * It will be dropped upon the corresponding VFS_UNMOUNT.
          * This prevents the mount point from being deleted.
          */
-        rwlock_write_unlock(&namespace_rwlock);
     } else {
         /* We still don't have the root file system mounted. */
         if (str_cmp(mp, "/") == 0) {
-            vfs_lookup_res_t mr_res;
-            vfs_node_t *mr_node;
-            fs_index_t rindex;
-            size_t rsize;
-            unsigned rlnkcnt;
             /*
              * For this simple, but important case,
              * we are almost done.
              */
             rc = ipc_data_write_start(phone, (void *)opts,
                 str_size(opts));
             if (rc != EOK) {
                 async_wait_for(msg, NULL);
                 vfs_release_phone(phone);
-                futex_up(&rootfs_futex);
+                fibril_rwlock_write_unlock(&namespace_rwlock);
                 ipc_answer_0(rid, rc);
                 return;
+            }
             async_wait_for(msg, &rc);
             vfs_release_phone(phone);
             if (rc != EOK) {
-                futex_up(&rootfs_futex);
+                fibril_rwlock_write_unlock(&namespace_rwlock);
                 ipc_answer_0(rid, rc);
                 return;
+            }
             rindex = (fs_index_t) IPC_GET_ARG1(answer);
             mr_res.lnkcnt = rlnkcnt;
             mr_res.type = VFS_NODE_DIRECTORY;
             rootfs.fs_handle = fs_handle;
             rootfs.dev_handle = dev_handle;
-            futex_up(&rootfs_futex);
             /* Add reference to the mounted root. */
             mr_node = vfs_node_get(&mr_res);
             assert(mr_node);
+            fibril_rwlock_write_unlock(&namespace_rwlock);
             ipc_answer_0(rid, rc);
             return;
         } else {
             /*
              * We can't resolve this without the root filesystem
              * being mounted first.
              */
-            futex_up(&rootfs_futex);
+            fibril_rwlock_write_unlock(&namespace_rwlock);
             ipc_answer_0(rid, ENOENT);
             return;
+        }
+    }
-    futex_up(&rootfs_futex);
     /*
      * At this point, we have all necessary pieces: file system and device
      * handles, and we know the mount point VFS node.
      */
+    int mountee_phone = vfs_grab_phone(fs_handle);
+    assert(mountee_phone >= 0);
     phone = vfs_grab_phone(mp_res.triplet.fs_handle);
     msg = async_send_4(phone, VFS_MOUNT,
         (ipcarg_t) mp_res.triplet.dev_handle,
         (ipcarg_t) mp_res.triplet.index,
         (ipcarg_t) fs_handle,
         (ipcarg_t) dev_handle, &answer);
+    /* send connection */
+    rc = async_req_1_0(phone, IPC_M_CONNECTION_CLONE, mountee_phone);
+    if (rc != EOK) {
+        async_wait_for(msg, NULL);
+        vfs_release_phone(mountee_phone);
+        vfs_release_phone(phone);
+        /* Mount failed, drop reference to mp_node. */
+        if (mp_node)
+            vfs_node_put(mp_node);
+        ipc_answer_0(rid, rc);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
+        return;
+    }
+    vfs_release_phone(mountee_phone);
     /* send the mount options */
     rc = ipc_data_write_start(phone, (void *)opts, str_size(opts));
     if (rc != EOK) {
         async_wait_for(msg, NULL);
         vfs_release_phone(phone);
         /* Mount failed, drop reference to mp_node. */
         if (mp_node)
             vfs_node_put(mp_node);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         ipc_answer_0(rid, rc);
         return;
+    }
     async_wait_for(msg, &rc);
     vfs_release_phone(phone);
-    if (rc != EOK) {
+    if (rc == EOK) {
+        rindex = (fs_index_t) IPC_GET_ARG1(answer);
+        rsize = (size_t) IPC_GET_ARG2(answer);
+        rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
+        mr_res.triplet.fs_handle = fs_handle;
+        mr_res.triplet.dev_handle = dev_handle;
+        mr_res.triplet.index = rindex;
+        mr_res.size = rsize;
+        mr_res.lnkcnt = rlnkcnt;
+        mr_res.type = VFS_NODE_DIRECTORY;
+        /* Add reference to the mounted root. */
+        mr_node = vfs_node_get(&mr_res);
+        assert(mr_node);
+    } else {
         /* Mount failed, drop reference to mp_node. */
         if (mp_node)
             vfs_node_put(mp_node);
+    }
-    ipc_answer_0(rid, rc);
-}
-/** Process pending mount requests */
-void vfs_process_pending_mount()
-{
-    link_t *cur;
-loop:
-    for (cur = pending_req.next; cur != &pending_req; cur = cur->next) {
-        pending_req_t *pr = list_get_instance(cur, pending_req_t, link);
-        fs_handle_t fs_handle = fs_name_to_handle(pr->fs_name, true);
-        if (!fs_handle)
-            continue;
-        /* Acknowledge that we know fs_name. */
-        ipc_answer_0(pr->callid, EOK);
+    ipc_answer_0(rid, rc);
-        /* Do the mount */
-        vfs_mount_internal(pr->rid, pr->dev_handle, fs_handle, pr->mp,
+    fibril_rwlock_write_unlock(&namespace_rwlock);
-            pr->opts);
-        free(pr->fs_name);
-        free(pr->mp);
-        free(pr->opts);
-        list_remove(cur);
-        free(pr);
-        goto loop;
-    }
+}
 void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
+{
     /*
     /*
      * Check if we know a file system with the same name as is in fs_name.
      * This will also give us its file system handle.
      */
+    fibril_mutex_lock(&fs_head_lock);
+    fs_handle_t fs_handle;
+recheck:
-    fs_handle_t fs_handle = fs_name_to_handle(fs_name, true);
+    fs_handle = fs_name_to_handle(fs_name, false);
     if (!fs_handle) {
         if (flags & IPC_FLAG_BLOCKING) {
-            pending_req_t *pr;
-            /* Blocking mount, add to pending list */
-            pr = (pending_req_t *) malloc(sizeof(pending_req_t));
+            fibril_condvar_wait(&fs_head_cv, &fs_head_lock);
-            if (!pr) {
-                ipc_answer_0(callid, ENOMEM);
-                ipc_answer_0(rid, ENOMEM);
-                free(mp);
+            goto recheck;
-                free(fs_name);
-                free(opts);
-                return;
-            }
-            pr->fs_name = fs_name;
-            pr->mp = mp;
-            pr->opts = opts;
-            pr->callid = callid;
-            pr->rid = rid;
-            pr->dev_handle = dev_handle;
-            link_initialize(&pr->link);
-            list_append(&pr->link, &pending_req);
-            return;
+        }
+        fibril_mutex_unlock(&fs_head_lock);
         ipc_answer_0(callid, ENOENT);
         ipc_answer_0(rid, ENOENT);
         free(mp);
         free(fs_name);
         free(opts);
         return;
+    }
+    fibril_mutex_unlock(&fs_head_lock);
     /* Acknowledge that we know fs_name. */
     ipc_answer_0(callid, EOK);
     /* Do the mount */
+{
     if (!vfs_files_init()) {
         ipc_answer_0(rid, ENOMEM);
         return;
+    }
     /*
      * The POSIX interface is open(path, oflag, mode).
      * We can receive oflags and mode along with the VFS_OPEN call; the path
      * will need to arrive in another call.
+     *
      */
     int lflag = IPC_GET_ARG1(*request);
     int oflag = IPC_GET_ARG2(*request);
     int mode = IPC_GET_ARG3(*request);
     size_t len;
     /*
      * Make sure that we are called with exactly one of L_FILE and
-     * L_DIRECTORY.
+     * L_DIRECTORY. Make sure that the user does not pass L_OPEN.
      */
-    if ((lflag & (L_FILE | L_DIRECTORY)) == 0 ||
+    if (((lflag & (L_FILE | L_DIRECTORY)) == 0) ||
-        (lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) {
+        ((lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) ||
+        ((lflag & L_OPEN) != 0)) {
         ipc_answer_0(rid, EINVAL);
         return;
+    }
     if (oflag & O_CREAT)
         lflag |= L_CREATE;
     if (oflag & O_EXCL)
         lflag |= L_EXCLUSIVE;
     ipc_callid_t callid;
     if (!ipc_data_write_receive(&callid, &len)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
+    }
     char *path = malloc(len + 1);
     if (!path) {
         ipc_answer_0(callid, ENOMEM);
         ipc_answer_0(rid, ENOMEM);
         return;
+    }
     int rc;
     if ((rc = ipc_data_write_finalize(callid, path, len))) {
         ipc_answer_0(rid, rc);
         free(path);
         return;
      * Avoid the race condition in which the file can be deleted before we
      * find/create-and-lock the VFS node corresponding to the looked-up
      * triplet.
      */
     if (lflag & L_CREATE)
-        rwlock_write_lock(&namespace_rwlock);
+        fibril_rwlock_write_lock(&namespace_rwlock);
     else
-        rwlock_read_lock(&namespace_rwlock);
+        fibril_rwlock_read_lock(&namespace_rwlock);
     /* The path is now populated and we can call vfs_lookup_internal(). */
     vfs_lookup_res_t lr;
-    rc = vfs_lookup_internal(path, lflag, &lr, NULL);
+    rc = vfs_lookup_internal(path, lflag | L_OPEN, &lr, NULL);
-    if (rc) {
+    if (rc != EOK) {
         if (lflag & L_CREATE)
-            rwlock_write_unlock(&namespace_rwlock);
+            fibril_rwlock_write_unlock(&namespace_rwlock);
         else
-            rwlock_read_unlock(&namespace_rwlock);
+            fibril_rwlock_read_unlock(&namespace_rwlock);
         ipc_answer_0(rid, rc);
         free(path);
         return;
+    }
     /* Path is no longer needed. */
     free(path);
     vfs_node_t *node = vfs_node_get(&lr);
     if (lflag & L_CREATE)
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
     else
-        rwlock_read_unlock(&namespace_rwlock);
+        fibril_rwlock_read_unlock(&namespace_rwlock);
     /* Truncate the file if requested and if necessary. */
     if (oflag & O_TRUNC) {
-        rwlock_write_lock(&node->contents_rwlock);
+        fibril_rwlock_write_lock(&node->contents_rwlock);
         if (node->size) {
             rc = vfs_truncate_internal(node->fs_handle,
                 node->dev_handle, node->index, 0);
             if (rc) {
-                rwlock_write_unlock(&node->contents_rwlock);
+                fibril_rwlock_write_unlock(&node->contents_rwlock);
                 vfs_node_put(node);
                 ipc_answer_0(rid, rc);
                 return;
+            }
             node->size = 0;
+        }
-        rwlock_write_unlock(&node->contents_rwlock);
+        fibril_rwlock_write_unlock(&node->contents_rwlock);
+    }
     /*
      * Get ourselves a file descriptor and the corresponding vfs_file_t
      * structure.
      */
     int fd = vfs_fd_alloc();
         ipc_answer_0(rid, fd);
         return;
+    }
     vfs_file_t *file = vfs_file_get(fd);
     file->node = node;
     if (oflag & O_APPEND)
         file->append = true;
     /*
      * The following increase in reference count is for the fact that the
      * file is being opened and that a file structure is pointing to it.
      * It is necessary so that the file will not disappear when
      * vfs_node_put() is called. The reference will be dropped by the
      * respective VFS_CLOSE.
      */
     vfs_node_addref(node);
     vfs_node_put(node);
+    /* Success! Return the new file descriptor to the client. */
+    ipc_answer_1(rid, EOK, fd);
+}
+void vfs_open_node(ipc_callid_t rid, ipc_call_t *request)
+{
+    // FIXME: check for sanity of the supplied fs, dev and index
+    if (!vfs_files_init()) {
+        ipc_answer_0(rid, ENOMEM);
+        return;
+    }
+    /*
+     * The interface is open_node(fs, dev, index, oflag).
+     */
+    vfs_lookup_res_t lr;
+    lr.triplet.fs_handle = IPC_GET_ARG1(*request);
+    lr.triplet.dev_handle = IPC_GET_ARG2(*request);
+    lr.triplet.index = IPC_GET_ARG3(*request);
+    int oflag = IPC_GET_ARG4(*request);
+    fibril_rwlock_read_lock(&namespace_rwlock);
+    int rc = vfs_open_node_internal(&lr);
+    if (rc != EOK) {
+        fibril_rwlock_read_unlock(&namespace_rwlock);
+        ipc_answer_0(rid, rc);
+        return;
+    }
+    vfs_node_t *node = vfs_node_get(&lr);
+    fibril_rwlock_read_unlock(&namespace_rwlock);
+    /* Truncate the file if requested and if necessary. */
+    if (oflag & O_TRUNC) {
+        fibril_rwlock_write_lock(&node->contents_rwlock);
+        if (node->size) {
+            rc = vfs_truncate_internal(node->fs_handle,
+                node->dev_handle, node->index, 0);
+            if (rc) {
+                fibril_rwlock_write_unlock(&node->contents_rwlock);
+                vfs_node_put(node);
+                ipc_answer_0(rid, rc);
+                return;
+            }
+            node->size = 0;
+        }
+        fibril_rwlock_write_unlock(&node->contents_rwlock);
+    }
+    /*
+     * Get ourselves a file descriptor and the corresponding vfs_file_t
+     * structure.
+     */
+    int fd = vfs_fd_alloc();
+    if (fd < 0) {
+        vfs_node_put(node);
+        ipc_answer_0(rid, fd);
+        return;
+    }
+    vfs_file_t *file = vfs_file_get(fd);
+    file->node = node;
+    if (oflag & O_APPEND)
+        file->append = true;
+    /*
+     * The following increase in reference count is for the fact that the
+     * file is being opened and that a file structure is pointing to it.
+     * It is necessary so that the file will not disappear when
+     * vfs_node_put() is called. The reference will be dropped by the
+     * respective VFS_CLOSE.
+     */
+    vfs_node_addref(node);
+    vfs_node_put(node);
     /* Success! Return the new file descriptor to the client. */
     ipc_answer_1(rid, EOK, fd);
+}
-void vfs_close(ipc_callid_t rid, ipc_call_t *request)
+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_DEVICE request at the destination FS server. */
+    aid_t msg;
+    ipc_call_t answer;
+    msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
+        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)
+{
+    int fd = IPC_GET_ARG1(*request);
+    /* Lookup the file structure corresponding to the file descriptor. */
-    int rc = vfs_fd_free(fd);
+    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_SYMC request at the destination FS server. */
+    aid_t msg;
+    ipc_call_t answer;
+    msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
+        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_0(rid, rc);
+}
+void vfs_close(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_CLOSE request at the destination FS server. */
+    aid_t msg;
+    ipc_call_t answer;
+    msg = async_send_2(fs_phone, IPC_GET_METHOD(*request),
+        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);
+    int retval = IPC_GET_ARG1(answer);
+    if (retval != EOK)
+        ipc_answer_0(rid, retval);
+    retval = vfs_fd_free(fd);
+    ipc_answer_0(rid, retval);
+}
 static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)
+{
     /*
      * The following code strongly depends on the fact that the files data
     /*
      * Lock the open file structure so that no other thread can manipulate
      * the same open file at a time.
      */
-    futex_down(&file->lock);
+    fibril_mutex_lock(&file->lock);
     /*
      * Lock the file's node so that no other client can read/write to it at
      * the same time.
      */
     if (read)
-        rwlock_read_lock(&file->node->contents_rwlock);
+        fibril_rwlock_read_lock(&file->node->contents_rwlock);
     else
-        rwlock_write_lock(&file->node->contents_rwlock);
+        fibril_rwlock_write_lock(&file->node->contents_rwlock);
     if (file->node->type == VFS_NODE_DIRECTORY) {
         /*
          * Make sure that no one is modifying the namespace
          * while we are in readdir().
          */
         assert(read);
-        rwlock_read_lock(&namespace_rwlock);
+        fibril_rwlock_read_lock(&namespace_rwlock);
+    }
     int fs_phone = vfs_grab_phone(file->node->fs_handle);
     /* Make a VFS_READ/VFS_WRITE request at the destination FS server. */
      * destination FS server. The call will be routed as if sent by
      * ourselves. Note that call arguments are immutable in this case so we
      * don't have to bother.
      */
     ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
-    vfs_release_phone(fs_phone);
     /* Wait for reply from the FS server. */
     ipcarg_t rc;
     async_wait_for(msg, &rc);
+    vfs_release_phone(fs_phone);
     size_t bytes = IPC_GET_ARG1(answer);
     if (file->node->type == VFS_NODE_DIRECTORY)
-        rwlock_read_unlock(&namespace_rwlock);
+        fibril_rwlock_read_unlock(&namespace_rwlock);
     /* Unlock the VFS node. */
     if (read)
-        rwlock_read_unlock(&file->node->contents_rwlock);
+        fibril_rwlock_read_unlock(&file->node->contents_rwlock);
     else {
         /* Update the cached version of node's size. */
         if (rc == EOK)
             file->node->size = IPC_GET_ARG2(answer);
-        rwlock_write_unlock(&file->node->contents_rwlock);
+        fibril_rwlock_write_unlock(&file->node->contents_rwlock);
+    }
     /* Update the position pointer and unlock the open file. */
     if (rc == EOK)
         file->pos += bytes;
-    futex_up(&file->lock);
+    fibril_mutex_unlock(&file->lock);
     /*
      * FS server's reply is the final result of the whole operation we
      * return to the client.
      */
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     off_t newpos;
-    futex_down(&file->lock);
+    fibril_mutex_lock(&file->lock);
     if (whence == SEEK_SET) {
         file->pos = off;
-        futex_up(&file->lock);
+        fibril_mutex_unlock(&file->lock);
         ipc_answer_1(rid, EOK, off);
         return;
+    }
     if (whence == SEEK_CUR) {
         if (file->pos + off < file->pos) {
-            futex_up(&file->lock);
+            fibril_mutex_unlock(&file->lock);
             ipc_answer_0(rid, EOVERFLOW);
             return;
+        }
         file->pos += off;
         newpos = file->pos;
-        futex_up(&file->lock);
+        fibril_mutex_unlock(&file->lock);
         ipc_answer_1(rid, EOK, newpos);
         return;
+    }
     if (whence == SEEK_END) {
-        rwlock_read_lock(&file->node->contents_rwlock);
+        fibril_rwlock_read_lock(&file->node->contents_rwlock);
         size_t size = file->node->size;
-        rwlock_read_unlock(&file->node->contents_rwlock);
+        fibril_rwlock_read_unlock(&file->node->contents_rwlock);
         if (size + off < size) {
-            futex_up(&file->lock);
+            fibril_mutex_unlock(&file->lock);
             ipc_answer_0(rid, EOVERFLOW);
             return;
+        }
         newpos = size + off;
-        futex_up(&file->lock);
+        fibril_mutex_unlock(&file->lock);
         ipc_answer_1(rid, EOK, newpos);
         return;
+    }
-    futex_up(&file->lock);
+    fibril_mutex_unlock(&file->lock);
     ipc_answer_0(rid, EINVAL);
+}
 int
 vfs_truncate_internal(fs_handle_t fs_handle, dev_handle_t dev_handle,
     vfs_file_t *file = vfs_file_get(fd);
     if (!file) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
-    futex_down(&file->lock);
+    fibril_mutex_lock(&file->lock);
-    rwlock_write_lock(&file->node->contents_rwlock);
+    fibril_rwlock_write_lock(&file->node->contents_rwlock);
     rc = vfs_truncate_internal(file->node->fs_handle,
         file->node->dev_handle, file->node->index, size);
     if (rc == EOK)
         file->node->size = size;
-    rwlock_write_unlock(&file->node->contents_rwlock);
+    fibril_rwlock_write_unlock(&file->node->contents_rwlock);
-    futex_up(&file->lock);
+    fibril_mutex_unlock(&file->lock);
     ipc_answer_0(rid, (ipcarg_t)rc);
+}
 void vfs_mkdir(ipc_callid_t rid, ipc_call_t *request)
+{
         free(path);
         return;
+    }
     path[len] = '\0';
-    rwlock_write_lock(&namespace_rwlock);
+    fibril_rwlock_write_lock(&namespace_rwlock);
     int lflag = L_DIRECTORY | L_CREATE | L_EXCLUSIVE;
     rc = vfs_lookup_internal(path, lflag, NULL, NULL);
-    rwlock_write_unlock(&namespace_rwlock);
+    fibril_rwlock_write_unlock(&namespace_rwlock);
     free(path);
     ipc_answer_0(rid, rc);
+}
 void vfs_unlink(ipc_callid_t rid, ipc_call_t *request)
         free(path);
         return;
+    }
     path[len] = '\0';
-    rwlock_write_lock(&namespace_rwlock);
+    fibril_rwlock_write_lock(&namespace_rwlock);
     lflag &= L_DIRECTORY;   /* sanitize lflag */
     vfs_lookup_res_t lr;
     rc = vfs_lookup_internal(path, lflag | L_UNLINK, &lr, NULL);
     free(path);
     if (rc != EOK) {
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         ipc_answer_0(rid, rc);
         return;
+    }
     /*
      * The name has already been unlinked by vfs_lookup_internal().
      * We have to get and put the VFS node to ensure that it is
      * VFS_DESTROY'ed after the last reference to it is dropped.
      */
     vfs_node_t *node = vfs_node_get(&lr);
-    futex_down(&nodes_futex);
+    fibril_mutex_lock(&nodes_mutex);
     node->lnkcnt--;
-    futex_up(&nodes_futex);
+    fibril_mutex_unlock(&nodes_mutex);
-    rwlock_write_unlock(&namespace_rwlock);
+    fibril_rwlock_write_unlock(&namespace_rwlock);
     vfs_node_put(node);
     ipc_answer_0(rid, EOK);
+}
 void vfs_rename(ipc_callid_t rid, ipc_call_t *request)
         free(new);
         return;
+    }
     oldc[olen] = '\0';
     newc[nlen] = '\0';
-    if (!str_lcmp(newc, oldc, str_length(oldc))) {
+    if ((!str_lcmp(newc, oldc, str_length(oldc))) &&
+        ((newc[str_length(oldc)] == '/') ||
+        (str_length(oldc) == 1) ||
+        (str_length(oldc) == str_length(newc)))) {
+            /*
-        /* oldc is a prefix of newc */
+         * oldc is a prefix of newc and either
+         * - newc continues with a / where oldc ends, or
+         * - oldc was / itself, or
+         * - oldc and newc are equal.
+         */
         ipc_answer_0(rid, EINVAL);
         free(old);
         free(new);
         return;
+    }
     vfs_lookup_res_t old_lr;
     vfs_lookup_res_t new_lr;
     vfs_lookup_res_t new_par_lr;
-    rwlock_write_lock(&namespace_rwlock);
+    fibril_rwlock_write_lock(&namespace_rwlock);
     /* Lookup the node belonging to the old file name. */
     rc = vfs_lookup_internal(oldc, L_NONE, &old_lr, NULL);
     if (rc != EOK) {
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         ipc_answer_0(rid, rc);
         free(old);
         free(new);
         return;
+    }
     vfs_node_t *old_node = vfs_node_get(&old_lr);
     if (!old_node) {
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         ipc_answer_0(rid, ENOMEM);
         free(old);
         free(new);
         return;
+    }
+    /* Determine the path to the parent of the node with the new name. */
+    char *parentc = str_dup(newc);
+    if (!parentc) {
+        fibril_rwlock_write_unlock(&namespace_rwlock);
+        ipc_answer_0(rid, rc);
+        free(old);
+        free(new);
+        return;
+    }
+    char *lastsl = str_rchr(parentc + 1, '/');
+    if (lastsl)
+        *lastsl = '\0';
+    else
+        parentc[1] = '\0';
     /* Lookup parent of the new file name. */
-    rc = vfs_lookup_internal(newc, L_PARENT, &new_par_lr, NULL);
+    rc = vfs_lookup_internal(parentc, L_NONE, &new_par_lr, NULL);
+    free(parentc);  /* not needed anymore */
     if (rc != EOK) {
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         ipc_answer_0(rid, rc);
         free(old);
         free(new);
         return;
+    }
     /* Check whether linking to the same file system instance. */
     if ((old_node->fs_handle != new_par_lr.triplet.fs_handle) ||
         (old_node->dev_handle != new_par_lr.triplet.dev_handle)) {
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         ipc_answer_0(rid, EXDEV);   /* different file systems */
         free(old);
         free(new);
         return;
+    }
         /* simply not in our way */
         break;
     case EOK:
         new_node = vfs_node_get(&new_lr);
         if (!new_node) {
-            rwlock_write_unlock(&namespace_rwlock);
+            fibril_rwlock_write_unlock(&namespace_rwlock);
             ipc_answer_0(rid, ENOMEM);
             free(old);
             free(new);
             return;
+        }
-        futex_down(&nodes_futex);
+        fibril_mutex_lock(&nodes_mutex);
         new_node->lnkcnt--;
-        futex_up(&nodes_futex);
+        fibril_mutex_unlock(&nodes_mutex);
         break;
     default:
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         ipc_answer_0(rid, ENOTEMPTY);
         free(old);
         free(new);
         return;
+    }
     /* Create the new link for the new name. */
     rc = vfs_lookup_internal(newc, L_LINK, NULL, NULL, old_node->index);
     if (rc != EOK) {
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         if (new_node)
             vfs_node_put(new_node);
         ipc_answer_0(rid, rc);
         free(old);
         free(new);
         return;
+    }
-    futex_down(&nodes_futex);
+    fibril_mutex_lock(&nodes_mutex);
     old_node->lnkcnt++;
-    futex_up(&nodes_futex);
+    fibril_mutex_unlock(&nodes_mutex);
     /* Destroy the link for the old name. */
     rc = vfs_lookup_internal(oldc, L_UNLINK, NULL, NULL);
     if (rc != EOK) {
-        rwlock_write_unlock(&namespace_rwlock);
+        fibril_rwlock_write_unlock(&namespace_rwlock);
         vfs_node_put(old_node);
         if (new_node)
             vfs_node_put(new_node);
         ipc_answer_0(rid, rc);
         free(old);
         free(new);
         return;
+    }
-    futex_down(&nodes_futex);
+    fibril_mutex_lock(&nodes_mutex);
     old_node->lnkcnt--;
-    futex_up(&nodes_futex);
+    fibril_mutex_unlock(&nodes_mutex);
-    rwlock_write_unlock(&namespace_rwlock);
+    fibril_rwlock_write_unlock(&namespace_rwlock);
     vfs_node_put(old_node);
     if (new_node)
         vfs_node_put(new_node);
     free(old);
     free(new);
     ipc_answer_0(rid, EOK);
+}
 /**
  * @}
  */

Subversion Repositories HelenOS

(root)/branches/network/uspace/srv/vfs/vfs_ops.c – Rev 4327 → 4581