Changeset b7c62a9 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2013-07-29T11:44:35Z (11 years ago)

Author:

Jiri Zarevucky <zarevucky.jiri@…>

Branches:

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

Children:

677745a

Parents:

9e9b168

Message:

Make the server oblivious to the link count. It is just another source of potential problems. Also clean up some confusion with file types and node refcount.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (9 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -79 +79 @@
         fs_index_t rindex;
         aoff64_t rsize;
-        unsigned rlnkcnt;
         async_exch_t *exch;
         sysarg_t rc;
@@ -130 +129 @@
                 rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
                     IPC_GET_ARG3(answer));
-                rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                 
                 mr_res.triplet.fs_handle = fs_handle;
@@ -136 +134 @@
                 mr_res.triplet.index = rindex;
                 mr_res.size = rsize;
-                mr_res.lnkcnt = rlnkcnt;
                 mr_res.type = VFS_NODE_DIRECTORY;
                         
@@ -237 +234 @@
                 rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
                     IPC_GET_ARG3(answer));
-                rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                 
                 mr_res.triplet.fs_handle = fs_handle;
@@ -243 +239 @@
                 mr_res.triplet.index = rindex;
                 mr_res.size = rsize;
-                mr_res.lnkcnt = rlnkcnt;
                 mr_res.type = VFS_NODE_DIRECTORY;
                 
@@ -668 +663 @@
         file->open_write = false;
         
-        vfs_node_addref(node);
-        vfs_node_put(node);
         vfs_file_put(file);
         if (parent) {
@@ -858 +851 @@
         size_t bytes = IPC_GET_ARG1(answer);
         
-        if (file->node->type == VFS_NODE_DIRECTORY)
+        if (file->node->type == VFS_NODE_DIRECTORY) {
                 fibril_rwlock_read_unlock(&namespace_rwlock);
+        }
         
         /* Unlock the VFS node. */
@@ -1120 +1114 @@
          * VFS_OUT_DESTROY'ed after the last reference to it is dropped.
          */
-        vfs_node_t *node = vfs_node_get(&lr);
-        vfs_node_delref(node);
-        vfs_node_put(node);
+        vfs_node_put(vfs_node_get(&lr));
 
 exit:
@@ -1225 +1217 @@
         
         if (orig_unlinked) {
-                vfs_node_t *node = vfs_node_get(&new_lr_orig);
-                vfs_node_delref(node);
-                vfs_node_put(node);
+                vfs_node_put(vfs_node_get(&new_lr_orig));
         }