Changeset 4f9ab1e in mainline

Timestamp:

2017-03-18T14:25:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f6b6b40

Parents:

7f59d6c

Message:

vfs_node_peek() should add a reference to the node

Location:

uspace/srv/vfs

Files:

• vfs_lookup.c (modified) (2 diffs)
• vfs_node.c (modified) (1 diff)
• vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -314 +314 @@
                 if (nlen > 0) {
                         base = vfs_node_peek(&res);
-                        if (base == NULL || base->mount == NULL) {
+                        if (!base) {
                                 rc = ENOENT;
                                 goto out;
                         }
+                        if (!base->mount) {
+                                vfs_node_put(base);
+                                rc = ENOENT;
+                                goto out;
+                        }
+                        vfs_node_put(base);
                         if (lflag & L_DISABLE_MOUNTS) {
                                 rc = EXDEV;
@@ -330 +336 @@
         if (result != NULL) {
                 /* The found file may be a mount point. Try to cross it. */
-                if (!(lflag & (L_MP|L_DISABLE_MOUNTS))) {
+                if (!(lflag & (L_MP | L_DISABLE_MOUNTS))) {
                         base = vfs_node_peek(&res);
-                        if (base != NULL && base->mount != NULL) {
-                                while (base->mount != NULL) {
-                                        base = base->mount;
+                        if (base && base->mount) {
+                                while (base->mount) {
+                                        vfs_node_addref(base->mount);
+                                        vfs_node_t *nbase = base->mount;
+                                        vfs_node_put(base);
+                                        base = nbase;
                                 }
                                 
-                                result->triplet = *(vfs_triplet_t *)base;
+                                result->triplet = *((vfs_triplet_t *) base);
                                 result->type = base->type;
-                                result->size = base->size;                              
-                                goto out;
-                        }
+                                result->size = base->size;
+                                vfs_node_put(base);
+                                goto out;
+                        }
+                        if (base)
+                                vfs_node_put(base);
                 }
 

uspace/srv/vfs/vfs_node.c

@@ -204 +204 @@
         if (tmp) {
                 node = hash_table_get_inst(tmp, vfs_node_t, nh_link);
+                _vfs_node_addref(node);
         }
         fibril_mutex_unlock(&nodes_mutex);

uspace/srv/vfs/vfs_ops.c

@@ -618 +618 @@
         
         /* If the node is not held by anyone, try to destroy it. */
-        if (orig_unlinked && vfs_node_peek(&new_lr_orig) == NULL) {
-                out_destroy(&new_lr_orig.triplet);
+        if (orig_unlinked) {
+                vfs_node_t *node = vfs_node_peek(&new_lr_orig);
+                if (!node)
+                        out_destroy(&new_lr_orig.triplet);
+                else
+                        vfs_node_put(node);
         }
         
@@ -824 +828 @@
                 }
                 
-                vfs_node_t *found_node = vfs_node_peek(&lr);            
+                vfs_node_t *found_node = vfs_node_peek(&lr);
+                vfs_node_put(found_node);
                 if (expect->node != found_node) {
                         rc = ENOENT;
@@ -841 +846 @@
 
         /* If the node is not held by anyone, try to destroy it. */
-        if (vfs_node_peek(&lr) == NULL) {
+        vfs_node_t *node = vfs_node_peek(&lr);
+        if (!node)
                 out_destroy(&lr.triplet);
-        }
+        else
+                vfs_node_put(node);
 
 exit: