Changes in uspace/lib/fs/libfs.c [1b20da0:a35b458] in mainline

File:

• uspace/lib/fs/libfs.c (modified) (32 diffs)

uspace/lib/fs/libfs.c

@@ -86 +86 @@
         errno_t rc;
         vfs_fs_probe_info_t info;
-        
+
         ipc_callid_t callid;
         size_t size;
@@ -95 +95 @@
                 return;
         }
-        
+
         memset(&info, 0, sizeof(info));
         rc = vfs_out_ops->fsprobe(service_id, &info);
@@ -103 +103 @@
                 return;
         }
-        
+
         async_data_read_finalize(callid, &info, sizeof(info));
         async_answer_0(rid, EOK);
@@ -113 +113 @@
         char *opts;
         errno_t rc;
-        
+
         /* Accept the mount options. */
         rc = async_data_write_accept((void **) &opts, true, 0, 0, 0, NULL);
@@ -268 +268 @@
         if (node == NULL)
                 async_answer_0(rid, EINVAL);
-        
+
         bool children = false;
         rc = libfs_ops->has_children(&children, node);
         libfs_ops->node_put(node);
-        
+
         if (rc != EOK)
                 async_answer_0(rid, rc);
@@ -288 +288 @@
                 async_answer_0(iid, EOK);
         }
-        
+
         while (true) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-                
+
                 if (!IPC_GET_IMETHOD(call))
                         return;
-                
+
                 switch (IPC_GET_IMETHOD(call)) {
                 case VFS_OUT_FSPROBE:
@@ -372 +372 @@
          * out-of-order, when it knows that the operation succeeded or failed.
          */
-        
+
         async_exch_t *exch = async_exchange_begin(sess);
-        
+
         ipc_call_t answer;
         aid_t req = async_send_0(exch, VFS_IN_REGISTER, &answer);
-        
+
         /*
          * Send our VFS info structure to VFS.
          */
         errno_t rc = async_data_write_start(exch, info, sizeof(*info));
-        
+
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -388 +388 @@
                 return rc;
         }
-        
+
         /*
          * Set VFS_OUT and libfs operations.
@@ -403 +403 @@
         rc = async_create_callback_port(exch, INTERFACE_VFS_DRIVER_CB, 0, 0,
             vfs_connection, NULL, &port);
-        
+
         /*
          * Request sharing the Path Lookup Buffer with VFS.
@@ -413 +413 @@
                 return ENOMEM;
         }
-        
+
         async_exchange_end(exch);
-        
+
         if (rc) {
                 async_forget(req);
                 return rc;
         }
-         
+
         /*
          * Pick up the answer for the request to the VFS_IN_REQUEST call.
@@ -426 +426 @@
         async_wait_for(req, NULL);
         reg.fs_handle = (int) IPC_GET_ARG1(answer);
-        
+
         /*
          * Tell the async framework that other connections are to be handled by
@@ -432 +432 @@
          */
         async_set_fallback_port_handler(vfs_connection, NULL);
-        
+
         return IPC_GET_RETVAL(answer);
 }
@@ -451 +451 @@
         unsigned pos = *ppos;
         unsigned size = 0;
-        
+
         if (pos == last) {
                 *sz = 0;
@@ -460 +460 @@
         if (c == '/')
                 pos++;
-        
+
         for (int i = 0; i <= NAME_MAX; i++) {
                 c = plb_get_char(pos);
@@ -480 +480 @@
         size_t size;
         ipc_callid_t wcall;
-        
+
         if (!async_data_write_receive(&wcall, &size))
                 return ENOENT;
@@ -498 +498 @@
         fs_index_t parent_index = IPC_GET_ARG2(*req);
         fs_index_t child_index = IPC_GET_ARG3(*req);
-        
+
         char component[NAME_MAX + 1];
         errno_t rc = receive_fname(component);
@@ -512 +512 @@
                 return;
         }
-        
+
         fs_node_t *child = NULL;
         rc = ops->node_get(&child, parent_sid, child_index);
@@ -520 +520 @@
                 return;
         }
-        
+
         rc = ops->link(parent, child, component);
         ops->node_put(parent);
@@ -548 +548 @@
         fs_index_t index = IPC_GET_ARG4(*req);
         int lflag = IPC_GET_ARG5(*req);
-        
+
         // TODO: Validate flags.
-        
+
         unsigned next = first;
         unsigned last = first + len;
-        
+
         char component[NAME_MAX + 1];
         errno_t rc;
-        
+
         fs_node_t *par = NULL;
         fs_node_t *cur = NULL;
         fs_node_t *tmp = NULL;
         unsigned clen = 0;
-        
+
         rc = ops->node_get(&cur, service_id, index);
         if (rc != EOK) {
@@ -567 +567 @@
                 goto out;
         }
-        
+
         assert(cur != NULL);
-        
+
         /* Find the file and its parent. */
-        
+
         unsigned last_next = 0;
-        
+
         while (next != last) {
                 if (cur == NULL) {
@@ -584 +584 @@
                         goto out;
                 }
-                
+
                 last_next = next;
                 /* Collect the component */
@@ -593 +593 @@
                         goto out;
                 }
-                
+
                 if (clen == 0) {
                         /* The path is just "/". */
                         break;
                 }
-                
+
                 assert(component[clen] == 0);
-                
+
                 /* Match the component */
                 rc = ops->match(&tmp, cur, component);
@@ -607 +607 @@
                         goto out;
                 }
-                
+
                 /* Descend one level */
                 if (par) {
@@ -616 +616 @@
                         }
                 }
-                
+
                 par = cur;
                 cur = tmp;
                 tmp = NULL;
         }
-        
+
         /* At this point, par is either NULL or a directory.
          * If cur is NULL, the looked up file does not exist yet.
          */
-         
+
         assert(par == NULL || ops->is_directory(par));
         assert(par != NULL || cur != NULL);
-        
+
         /* Check for some error conditions. */
-        
+
         if (cur && (lflag & L_FILE) && (ops->is_directory(cur))) {
                 async_answer_0(rid, EISDIR);
                 goto out;
         }
-        
+
         if (cur && (lflag & L_DIRECTORY) && (ops->is_file(cur))) {
                 async_answer_0(rid, ENOTDIR);
                 goto out;
         }
-        
+
         /* Unlink. */
-        
+
         if (lflag & L_UNLINK) {
                 if (!cur) {
@@ -652 +652 @@
                         goto out;
                 }
-                
+
                 rc = ops->unlink(par, cur, component);
                 if (rc == EOK) {
@@ -665 +665 @@
                 goto out;
         }
-        
+
         /* Create. */
-        
+
         if (lflag & L_CREATE) {
                 if (cur && (lflag & L_EXCLUSIVE)) {
@@ -673 +673 @@
                         goto out;
                 }
-        
+
                 if (!cur) {
                         rc = ops->create(&cur, service_id,
@@ -685 +685 @@
                                 goto out;
                         }
-                        
+
                         rc = ops->link(par, cur, component);
                         if (rc != EOK) {
@@ -695 +695 @@
                 }
         }
-        
+
         /* Return. */
 out1:
@@ -704 +704 @@
                 goto out;
         }
-        
+
         async_answer_5(rid, EOK, fs_handle, ops->index_get(cur),
             (ops->is_directory(cur) << 16) | last, LOWER32(ops->size_get(cur)),
             UPPER32(ops->size_get(cur)));
-        
+
 out:
         if (par)
                 (void) ops->node_put(par);
-        
+
         if (cur)
                 (void) ops->node_put(cur);
-        
+
         if (tmp)
                 (void) ops->node_put(tmp);
@@ -824 +824 @@
         service_id_t service_id = IPC_GET_ARG1(*request);
         fs_index_t index = IPC_GET_ARG2(*request);
-        
+
         fs_node_t *fn;
         errno_t rc = ops->node_get(&fn, service_id, index);
         on_error(rc, answer_and_return(rid, rc));
-        
+
         if (fn == NULL) {
                 async_answer_0(rid, ENOENT);
                 return;
         }
-        
+
         rc = ops->node_open(fn);
         aoff64_t size = ops->size_get(fn);
@@ -840 +840 @@
             (ops->is_file(fn) ? L_FILE : 0) |
             (ops->is_directory(fn) ? L_DIRECTORY : 0));
-        
+
         (void) ops->node_put(fn);
 }