Changeset 4f9ab1e in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2017-03-18T14:25:47Z (7 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

File:

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

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: