Changeset 79ea5af in mainline for uspace/srv/vfs


Ignore:
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()
Location:
uspace/srv/vfs
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/vfs/vfs.h

    rae7bfbbd r79ea5af  
    215215extern int vfs_op_sync(int fd);
    216216extern int vfs_op_truncate(int fd, int64_t size);
    217 extern int vfs_op_unlink(int parentfd, int expectfd, int wflag, char *path);
     217extern int vfs_op_unlink(int parentfd, int expectfd, char *path);
    218218extern int vfs_op_unmount(int mpfd);
    219219extern int vfs_op_wait_handle(bool high_fd);

  • uspace/srv/vfs/vfs_ipc.c

    rae7bfbbd r79ea5af  
    194194        int parentfd = IPC_GET_ARG1(*request);
    195195        int expectfd = IPC_GET_ARG2(*request);
    196         int wflag = IPC_GET_ARG3(*request);
    197196       
    198197        char *path;
    199198        int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
    200199        if (rc == EOK)
    201                 rc = vfs_op_unlink(parentfd, expectfd, wflag, path);
     200                rc = vfs_op_unlink(parentfd, expectfd, path);
    202201       
    203202        async_answer_0(rid, rc);

  • uspace/srv/vfs/vfs_ops.c

    rae7bfbbd r79ea5af  
    672672}
    673673
    674 int vfs_op_unlink(int parentfd, int expectfd, int wflag, char *path)
     674int vfs_op_unlink(int parentfd, int expectfd, char *path)
    675675{
    676676        int rc = EOK;
    … …  
    683683        fibril_rwlock_write_lock(&namespace_rwlock);
    684684       
    685         int lflag = (wflag & WALK_DIRECTORY) ? L_DIRECTORY: 0;
    686 
    687685        /*
    688686         * Files are retrieved in order of file descriptors, to prevent
    … …  
    717715        if (expectfd >= 0) {
    718716                vfs_lookup_res_t lr;
    719                 rc = vfs_lookup_internal(parent->node, path, lflag, &lr);
     717                rc = vfs_lookup_internal(parent->node, path, 0, &lr);
    720718                if (rc != EOK)
    721719                        goto exit;
    … …  
    733731       
    734732        vfs_lookup_res_t lr;
    735         rc = vfs_lookup_internal(parent->node, path, lflag | L_UNLINK, &lr);
     733        rc = vfs_lookup_internal(parent->node, path, L_UNLINK, &lr);
    736734        if (rc != EOK)
    737735                goto exit;
Note: See TracChangeset for help on using the changeset viewer.