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

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

File:

• uspace/srv/vfs/vfs_lookup.c (modified) (2 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);
                 }