Changeset 4f46695e in mainline

Timestamp:

2009-05-09T08:39:28Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cf95bc0

Parents:

f4876df

Message:

Lookup a node's parent lexically rather than using the broken L_PARENT flag of
VFS_LOOKUP.

Location:

uspace

Files:

• lib/libfs/libfs.c (modified) (2 diffs)
• srv/vfs/vfs.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/lib/libfs/libfs.c

@@ -217 +217 @@
                                 }
                                 goto out;
-                        } else if (lflag & L_PARENT) {
-                                /* return parent */
-                                ipc_answer_5(rid, EOK, fs_handle, dev_handle,
-                                    ops->index_get(cur), ops->size_get(cur),
-                                    ops->lnkcnt_get(cur));
                         } 
                         ipc_answer_0(rid, ENOENT);
@@ -294 +289 @@
 
         /* handle hit */
-        if (lflag & L_PARENT) {
-                ops->node_put(cur);
-                cur = par;
-                par = NULL;
-                if (!cur) {
-                        ipc_answer_0(rid, ENOENT);
-                        goto out;
-                }
-        }
         if (lflag & L_UNLINK) {
                 unsigned old_lnkcnt = ops->lnkcnt_get(cur);

uspace/srv/vfs/vfs.h

@@ -167 +167 @@
  */
 #define L_UNLINK        32      
-/**
- * L_PARENT performs a lookup but returns the triplet of the parent node.
- * This flag may not be combined with any other lookup flag.
- */
-#define L_PARENT        64      
 
 typedef enum vfs_node_type {

uspace/srv/vfs/vfs_ops.c

@@ -990 +990 @@
                 return;
         }
+        /* Determine the path to the parent of the node with the new name. */
+        char *parentc = str_dup(newc);
+        if (!parentc) {
+                rwlock_write_unlock(&namespace_rwlock);
+                ipc_answer_0(rid, rc);
+                free(old);
+                free(new);
+                return;
+        }
+        char *lastsl = str_rchr(parentc + 1, L'/');
+        if (lastsl)
+                *lastsl = '\0';
+        else
+                parentc[1] = '\0';
         /* Lookup parent of the new file name. */
-        rc = vfs_lookup_internal(newc, L_PARENT, &new_par_lr, NULL);
+        rc = vfs_lookup_internal(parentc, L_NONE, &new_par_lr, NULL);
+        free(parentc);  /* not needed anymore */
         if (rc != EOK) {
                 rwlock_write_unlock(&namespace_rwlock);