Changeset b7c62a9 in mainline for uspace/lib/fs/libfs.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/lib/fs/libfs.c (modified) (3 diffs)

uspace/lib/fs/libfs.c

@@ -203 +203 @@
         service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
+
         int rc;
-
-        rc = vfs_out_ops->destroy(service_id, index);
-
+        fs_node_t *node = NULL;
+        rc = libfs_ops->node_get(&node, service_id, index);
+        if (rc == EOK && node != NULL) {
+                bool destroy = (libfs_ops->lnkcnt_get(node) == 0);
+                libfs_ops->node_put(node);
+                if (destroy) {
+                        rc = vfs_out_ops->destroy(service_id, index);
+                }
+        }
         async_answer_0(rid, rc);
 }
@@ -769 +776 @@
                         async_answer_5(rid, fs_handle, service_id,
                             ops->index_get(cur), LOWER32(size), UPPER32(size),
-                            ops->lnkcnt_get(cur));
+                            ops->is_directory(cur) ? VFS_NODE_DIRECTORY : VFS_NODE_FILE);
                         LOG_EXIT(EOK);
                 } else {
@@ -831 +838 @@
         async_answer_5(rid, fs_handle, service_id,
                 ops->index_get(cur), LOWER32(size), UPPER32(size),
-                ops->lnkcnt_get(cur));
+                ops->is_directory(cur) ? VFS_NODE_DIRECTORY : VFS_NODE_FILE);
         
         LOG_EXIT(EOK);