Changeset d60ce4a in mainline

Timestamp:

2013-07-25T12:56:08Z (11 years ago)

Author:

Ji?? Z?rev?cky <zarevucky.jiri@…>

Branches:

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

Children:

bf9dc4e2

Parents:

d18c404

Message:

Remove UNLINK from the server.

Location:

uspace

Files:

• app/trace/trace.c (modified) (1 diff)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/app/trace/trace.c

@@ -714 +714 @@
         o = oper_new("sync", 1, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_SYNC, o);
-        o = oper_new("unlink", 0, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_UNLINK, o);
         o = oper_new("rename", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_RENAME, o);

uspace/srv/vfs/vfs.c

@@ -109 +109 @@
                         vfs_fstat(callid, &call);
                         break;
-                case VFS_IN_UNLINK:
-                        vfs_unlink(callid, &call);
-                        break;
                 case VFS_IN_UNLINK2:
                         vfs_unlink2(callid, &call);

uspace/srv/vfs/vfs.h

@@ -219 +219 @@
 extern void vfs_truncate(ipc_callid_t, ipc_call_t *);
 extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
-extern void vfs_unlink(ipc_callid_t, ipc_call_t *);
 extern void vfs_rename(ipc_callid_t, ipc_call_t *);
 extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *);

uspace/srv/vfs/vfs_ops.c

@@ -1063 +1063 @@
 }
 
-void vfs_unlink(ipc_callid_t rid, ipc_call_t *request)
-{
-        int lflag = IPC_GET_ARG1(*request);
-        
-        char *path;
-        int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
-        if (rc != EOK) {
-                async_answer_0(rid, rc);
-                return;
-        }
-        
-        fibril_rwlock_write_lock(&namespace_rwlock);
-        lflag &= L_DIRECTORY;   /* sanitize lflag */
-        vfs_lookup_res_t lr;
-        rc = vfs_lookup_internal(path, lflag | L_UNLINK, &lr, NULL);
-        free(path);
-        if (rc != EOK) {
-                fibril_rwlock_write_unlock(&namespace_rwlock);
-                async_answer_0(rid, rc);
-                return;
-        }
-
-        /*
-         * The name has already been unlinked by vfs_lookup_internal().
-         * We have to get and put the VFS node to ensure that it is
-         * VFS_OUT_DESTROY'ed after the last reference to it is dropped.
-         */
-        vfs_node_t *node = vfs_node_get(&lr);
-        fibril_mutex_lock(&nodes_mutex);
-        node->lnkcnt--;
-        fibril_mutex_unlock(&nodes_mutex);
-        fibril_rwlock_write_unlock(&namespace_rwlock);
-        vfs_node_put(node);
-        async_answer_0(rid, EOK);
-}
-
 void vfs_unlink2(ipc_callid_t rid, ipc_call_t *request)
 {