Changeset 20c071d in mainline

Timestamp:

2013-07-25T12:28:48Z (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:

d18c404

Parents:

fadc76f

Message:

Implement server side of unlink2().

Location:

uspace

Files:

• app/trace/trace.c (modified) (1 diff)
• lib/c/include/ipc/vfs.h (modified) (1 diff)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (2 diffs)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/app/trace/trace.c

@@ -718 +718 @@
         o = oper_new("rename", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_RENAME, o);
-        o = oper_new("walk", 3, arg_def, V_INT_ERRNO, 0, resp_def);
+        o = oper_new("walk", 2, arg_def, V_INT_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_WALK, o);
         o = oper_new("open2", 2, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_OPEN2, o);
+        o = oper_new("unlink2", 3, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_UNLINK2, o);
 
         proto_register(SERVICE_VFS, p);

uspace/lib/c/include/ipc/vfs.h

@@ -81 +81 @@
         VFS_IN_WALK,
         VFS_IN_OPEN2,
+        VFS_IN_UNLINK2,
 } vfs_in_request_t;
 

uspace/srv/vfs/vfs.c

@@ -112 +112 @@
                         vfs_unlink(callid, &call);
                         break;
+                case VFS_IN_UNLINK2:
+                        vfs_unlink2(callid, &call);
+                        break;
                 case VFS_IN_RENAME:
                         vfs_rename(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_stat(ipc_callid_t, ipc_call_t *);
-extern void vfs_mkdir(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 *);
@@ -228 +226 @@
 extern void vfs_walk(ipc_callid_t, ipc_call_t *);
 extern void vfs_open2(ipc_callid_t, ipc_call_t *);
+extern void vfs_unlink2(ipc_callid_t, ipc_call_t *);
 
 #endif

uspace/srv/vfs/vfs_ops.c

@@ -1099 +1099 @@
 }
 
+void vfs_unlink2(ipc_callid_t rid, ipc_call_t *request)
+{
+        int rc;
+        char *path;
+        vfs_file_t *parent = NULL;
+        vfs_file_t *expect = NULL;
+        vfs_pair_t *parent_node = NULL;
+        
+        int parentfd = IPC_GET_ARG1(*request);
+        int expectfd = IPC_GET_ARG2(*request);
+        int wflag = IPC_GET_ARG3(*request);
+        
+        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);
+        
+        int lflag = (wflag&WALK_DIRECTORY) ? L_DIRECTORY: 0;
+
+        if (parentfd >= 0) {
+                parent = vfs_file_get(parentfd);
+                if (!parent) {
+                        rc = ENOENT;
+                        goto exit;
+                }
+                parent_node = (vfs_pair_t *)parent->node;
+        }
+        
+        if (expectfd >= 0) {
+                expect = vfs_file_get(expectfd);
+                if (!expect) {
+                        rc = ENOENT;
+                        goto exit;
+                }
+                
+                vfs_lookup_res_t lr;
+                rc = vfs_lookup_internal(path, lflag, &lr, parent_node);
+                if (rc != EOK) {
+                        goto exit;
+                }
+                
+                if (__builtin_memcmp(&lr.triplet, expect->node, sizeof(vfs_triplet_t)) != 0) {
+                        rc = ENOENT;
+                        goto exit;
+                }
+                
+                vfs_file_put(expect);
+                expect = NULL;
+        }
+        
+        vfs_lookup_res_t lr;
+        rc = vfs_lookup_internal(path, lflag | L_UNLINK, &lr, parent_node);
+        if (rc != EOK) {
+                goto exit;
+        }
+
+        /*
+         * 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);
+        vfs_node_delref(node);
+        vfs_node_put(node);
+
+exit:
+        if (path) {
+                free(path);
+        }
+        if (parent) {
+                vfs_file_put(parent);
+        }
+        if (expect) {
+                vfs_file_put(expect);
+        }
+        fibril_rwlock_write_unlock(&namespace_rwlock);
+        async_answer_0(rid, rc);
+}
+
 void vfs_rename(ipc_callid_t rid, ipc_call_t *request)
 {