Changeset 79ea5af in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2017-03-30T20:47:53Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

67e881c

Parents:

ae7bfbbd

Message:

Rename unlink() to vfs_unlink_path() and _vfs_unlink() to vfs_unlink()

• Also, remove rmdir()

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -672 +672 @@
 }
 
-int vfs_op_unlink(int parentfd, int expectfd, int wflag, char *path)
+int vfs_op_unlink(int parentfd, int expectfd, char *path)
 {
         int rc = EOK;
@@ -683 +683 @@
         fibril_rwlock_write_lock(&namespace_rwlock);
         
-        int lflag = (wflag & WALK_DIRECTORY) ? L_DIRECTORY: 0;
-
         /* 
          * Files are retrieved in order of file descriptors, to prevent
@@ -717 +715 @@
         if (expectfd >= 0) {
                 vfs_lookup_res_t lr;
-                rc = vfs_lookup_internal(parent->node, path, lflag, &lr);
+                rc = vfs_lookup_internal(parent->node, path, 0, &lr);
                 if (rc != EOK)
                         goto exit;
@@ -733 +731 @@
         
         vfs_lookup_res_t lr;
-        rc = vfs_lookup_internal(parent->node, path, lflag | L_UNLINK, &lr);
+        rc = vfs_lookup_internal(parent->node, path, L_UNLINK, &lr);
         if (rc != EOK)
                 goto exit;