Changes in uspace/lib/c/generic/vfs/vfs.c [a35b458:1b20da0] in mainline

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (36 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -264 +264 @@
 {
         fibril_mutex_lock(&cwd_mutex);
-
+        
         if ((cwd_size == 0) || (size < cwd_size + 1)) {
                 fibril_mutex_unlock(&cwd_mutex);
                 return ERANGE;
         }
-
+        
         str_cpy(buf, size, cwd_path);
         fibril_mutex_unlock(&cwd_mutex);
-
+        
         return EOK;
 }
@@ -288 +288 @@
         if (!abs)
                 return ENOMEM;
-
+        
         int fd;
         errno_t rc = vfs_lookup(abs, WALK_DIRECTORY, &fd);
@@ -295 +295 @@
                 return rc;
         }
-
+        
         fibril_mutex_lock(&cwd_mutex);
-
+        
         if (cwd_fd >= 0)
                 vfs_put(cwd_fd);
-
+        
         if (cwd_path)
                 free(cwd_path);
-
+        
         cwd_fd = fd;
         cwd_path = abs;
         cwd_size = abs_size;
-
+        
         fibril_mutex_unlock(&cwd_mutex);
         return EOK;
@@ -319 +319 @@
 {
         fibril_mutex_lock(&vfs_mutex);
-
+        
         while (vfs_sess == NULL) {
                 vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS,
                     0);
         }
-
+        
         fibril_mutex_unlock(&vfs_mutex);
-
+        
         return async_exchange_begin(vfs_sess);
 }
@@ -356 +356 @@
         if (rc != EOK)
                 return NULL;
-
+        
         if (stat.service == 0)
                 return NULL;
-
+        
         return loc_service_connect(stat.service, iface, 0);
 }
@@ -376 +376 @@
 {
         errno_t rc;
-
+        
         ipc_call_t answer;
         async_exch_t *exch = vfs_exchange_begin();
         aid_t req = async_send_1(exch, VFS_IN_FSPROBE, serv, &answer);
-
+        
         rc = async_data_write_start(exch, (void *) fs_name,
             str_size(fs_name));
-
+        
         async_wait_for(req, &rc);
-
+        
         if (rc != EOK) {
                 vfs_exchange_end(exch);
                 return rc;
         }
-
+        
         rc = async_data_read_start(exch, info, sizeof(*info));
         vfs_exchange_end(exch);
-
+        
         return rc;
 }
@@ -620 +620 @@
 {
         errno_t rc, rc1;
-
+        
         if (!mountedfd)
                 flags |= VFS_MOUNT_NO_REF;
         if (mp < 0)
                 flags |= VFS_MOUNT_CONNECT_ONLY;
-
+        
         ipc_call_t answer;
         async_exch_t *exch = vfs_exchange_begin();
@@ -643 +643 @@
         if (mountedfd)
                 *mountedfd = (int) IPC_GET_ARG1(answer);
-
+        
         if (rc != EOK)
                 return rc;
@@ -665 +665 @@
         int null_id = -1;
         char null[LOC_NAME_MAXLEN];
-
+        
         if (str_cmp(fqsn, "") == 0) {
                 /*
@@ -671 +671 @@
                 */
                 null_id = loc_null_create();
-
+                
                 if (null_id == -1)
                         return ENOMEM;
-
+                
                 snprintf(null, LOC_NAME_MAXLEN, "null/%d", null_id);
                 fqsn = null;
         }
-
+        
         if (flags & IPC_FLAG_BLOCKING)
                 flags = VFS_MOUNT_BLOCKING;
         else
                 flags = 0;
-
+        
         service_id_t service_id;
         errno_t res = loc_service_get_id(fqsn, &service_id, flags);
@@ -689 +689 @@
                 if (null_id != -1)
                         loc_null_destroy(null_id);
-
+                
                 return res;
         }
-
+        
         size_t mpa_size;
         char *mpa = vfs_absolutize(mp, &mpa_size);
@@ -698 +698 @@
                 if (null_id != -1)
                         loc_null_destroy(null_id);
-
+                
                 return ENOMEM;
         }
-
+        
         fibril_mutex_lock(&root_mutex);
-
+        
         errno_t rc;
-
+        
         if (str_cmp(mpa, "/") == 0) {
                 /* Mounting root. */
-
+                
                 if (root_fd >= 0) {
                         fibril_mutex_unlock(&root_mutex);
@@ -715 +715 @@
                         return EBUSY;
                 }
-
+                
                 int root;
                 rc = vfs_mount(-1, fs_name, service_id, opts, flags, instance,
@@ -728 +728 @@
                         return EINVAL;
                 }
-
+                
                 int mpfd;
                 rc = vfs_walk(root_fd, mpa, WALK_DIRECTORY, &mpfd);
@@ -737 +737 @@
                 }
         }
-
+        
         fibril_mutex_unlock(&root_mutex);
-
+        
         if ((rc != EOK) && (null_id != -1))
                 loc_null_destroy(null_id);
-
+        
         return (errno_t) rc;
 }
@@ -759 +759 @@
         errno_t rc = async_req_2_0(exch, VFS_IN_OPEN, file, mode);
         vfs_exchange_end(exch);
-
+        
         return rc;
 }
@@ -788 +788 @@
         errno_t rc = async_req_1_0(exch, VFS_IN_PUT, file);
         vfs_exchange_end(exch);
-
+        
         return rc;
 }
@@ -845 +845 @@
         uint8_t *bp = (uint8_t *) buf;
         errno_t rc;
-
+        
         do {
                 bp += cnt;
@@ -852 +852 @@
                 rc = vfs_read_short(file, *pos, bp, nbyte - nr, &cnt);
         } while (rc == EOK && cnt > 0 && (nbyte - nr - cnt) > 0);
-
+        
         if (rc != EOK) {
                 *nread = nr;
                 return rc;
         }
-
+        
         nr += cnt;
         *pos += cnt;
@@ -885 +885 @@
         ipc_call_t answer;
         aid_t req;
-
+        
         if (nbyte > DATA_XFER_LIMIT)
                 nbyte = DATA_XFER_LIMIT;
-
-        async_exch_t *exch = vfs_exchange_begin();
-
+        
+        async_exch_t *exch = vfs_exchange_begin();
+        
         req = async_send_3(exch, VFS_IN_READ, file, LOWER32(pos),
             UPPER32(pos), &answer);
@@ -896 +896 @@
 
         vfs_exchange_end(exch);
-
+        
         if (rc == EOK)
                 async_wait_for(req, &rc);
         else
                 async_forget(req);
-
+        
         if (rc != EOK)
                 return rc;
-
+        
         *nread = (ssize_t) IPC_GET_ARG1(answer);
         return EOK;
@@ -926 +926 @@
         errno_t rc_orig;
         aid_t req;
-
+        
         size_t olda_size;
         char *olda = vfs_absolutize(old, &olda_size);
@@ -938 +938 @@
                 return ENOMEM;
         }
-
+        
         async_exch_t *exch = vfs_exchange_begin();
         int root = vfs_root();
@@ -946 +946 @@
                 return ENOENT;
         }
-
+        
         req = async_send_1(exch, VFS_IN_RENAME, root, NULL);
         rc = async_data_write_start(exch, olda, olda_size);
@@ -994 +994 @@
             UPPER32(length));
         vfs_exchange_end(exch);
-
+        
         return rc;
 }
@@ -1056 +1056 @@
         errno_t rc;
         aid_t req;
-
-        async_exch_t *exch = vfs_exchange_begin();
-
+        
+        async_exch_t *exch = vfs_exchange_begin();
+        
         req = async_send_1(exch, VFS_IN_STAT, file, NULL);
         rc = async_data_read_start(exch, (void *) stat, sizeof(vfs_stat_t));
         if (rc != EOK) {
                 vfs_exchange_end(exch);
-
+                
                 errno_t rc_orig;
                 async_wait_for(req, &rc_orig);
-
+                
                 if (rc_orig != EOK)
                         rc = rc_orig;
-
-                return rc;
-        }
-
+                
+                return rc;
+        }
+        
         vfs_exchange_end(exch);
         async_wait_for(req, &rc);
-
+        
         return rc;
 }
@@ -1092 +1092 @@
         if (rc != EOK)
                 return rc;
-
+        
         rc = vfs_stat(file, stat);
 
@@ -1138 +1138 @@
         if (rc != EOK)
                 return rc;
-
+        
         rc = vfs_statfs(file, st);
 
@@ -1157 +1157 @@
         errno_t rc = async_req_1_0(exch, VFS_IN_SYNC, file);
         vfs_exchange_end(exch);
-
+        
         return rc;
 }
@@ -1178 +1178 @@
         errno_t rc;
         aid_t req;
-
-        async_exch_t *exch = vfs_exchange_begin();
-
+        
+        async_exch_t *exch = vfs_exchange_begin();
+        
         req = async_send_2(exch, VFS_IN_UNLINK, parent, expect, NULL);
         rc = async_data_write_start(exch, child, str_size(child));
-
-        vfs_exchange_end(exch);
-
+        
+        vfs_exchange_end(exch);
+        
         errno_t rc_orig;
         async_wait_for(req, &rc_orig);
-
+        
         if (rc_orig != EOK)
                 return (errno_t) rc_orig;
@@ -1219 +1219 @@
 
         rc = vfs_unlink(parent, child, expect);
-
+        
         free(child);
         vfs_put(parent);
@@ -1252 +1252 @@
         if (rc != EOK)
                 return rc;
-
+        
         rc = vfs_unmount(mp);
         vfs_put(mp);
@@ -1270 +1270 @@
 {
         async_exch_t *exch = vfs_exchange_begin();
-
+        
         ipc_call_t answer;
         aid_t req = async_send_2(exch, VFS_IN_WALK, parent, flags, &answer);
         errno_t rc = async_data_write_start(exch, path, str_size(path));
         vfs_exchange_end(exch);
-
+                
         errno_t rc_orig;
         async_wait_for(req, &rc_orig);
@@ -1281 +1281 @@
         if (rc_orig != EOK)
                 return (errno_t) rc_orig;
-
+                
         if (rc != EOK)
                 return (errno_t) rc;
-
+        
         *handle = (int) IPC_GET_ARG1(answer);
         return EOK;
@@ -1349 +1349 @@
         ipc_call_t answer;
         aid_t req;
-
+        
         if (nbyte > DATA_XFER_LIMIT)
                 nbyte = DATA_XFER_LIMIT;
-
-        async_exch_t *exch = vfs_exchange_begin();
-
+        
+        async_exch_t *exch = vfs_exchange_begin();
+        
         req = async_send_3(exch, VFS_IN_WRITE, file, LOWER32(pos),
             UPPER32(pos), &answer);
         rc = async_data_write_start(exch, (void *) buf, nbyte);
-
-        vfs_exchange_end(exch);
-
+        
+        vfs_exchange_end(exch);
+        
         if (rc == EOK)
                 async_wait_for(req, &rc);
@@ -1368 +1368 @@
         if (rc != EOK)
                 return rc;
-
+        
         *nwritten = (ssize_t) IPC_GET_ARG1(answer);
         return EOK;