Changes in uspace/srv/fs/exfat/exfat_ops.c [b7fd2a0:38d150e] in mainline

File:

• uspace/srv/fs/exfat/exfat_ops.c (modified) (37 diffs)

uspace/srv/fs/exfat/exfat_ops.c

@@ -72 +72 @@
  */
 
-static errno_t exfat_root_get(fs_node_t **, service_id_t);
-static errno_t exfat_match(fs_node_t **, fs_node_t *, const char *);
-static errno_t exfat_node_get(fs_node_t **, service_id_t, fs_index_t);
-static errno_t exfat_node_open(fs_node_t *);
-/* static errno_t exfat_node_put(fs_node_t *); */
-static errno_t exfat_create_node(fs_node_t **, service_id_t, int);
-static errno_t exfat_destroy_node(fs_node_t *);
-static errno_t exfat_link(fs_node_t *, fs_node_t *, const char *);
-static errno_t exfat_unlink(fs_node_t *, fs_node_t *, const char *);
-static errno_t exfat_has_children(bool *, fs_node_t *);
+static int exfat_root_get(fs_node_t **, service_id_t);
+static int exfat_match(fs_node_t **, fs_node_t *, const char *);
+static int exfat_node_get(fs_node_t **, service_id_t, fs_index_t);
+static int exfat_node_open(fs_node_t *);
+/* static int exfat_node_put(fs_node_t *); */
+static int exfat_create_node(fs_node_t **, service_id_t, int);
+static int exfat_destroy_node(fs_node_t *);
+static int exfat_link(fs_node_t *, fs_node_t *, const char *);
+static int exfat_unlink(fs_node_t *, fs_node_t *, const char *);
+static int exfat_has_children(bool *, fs_node_t *);
 static fs_index_t exfat_index_get(fs_node_t *);
 static aoff64_t exfat_size_get(fs_node_t *);
@@ -88 +88 @@
 static bool exfat_is_file(fs_node_t *node);
 static service_id_t exfat_service_get(fs_node_t *node);
-static errno_t exfat_size_block(service_id_t, uint32_t *);
-static errno_t exfat_total_block_count(service_id_t, uint64_t *);
-static errno_t exfat_free_block_count(service_id_t, uint64_t *);
+static int exfat_size_block(service_id_t, uint32_t *);
+static int exfat_total_block_count(service_id_t, uint64_t *);
+static int exfat_free_block_count(service_id_t, uint64_t *);
 
 /*
@@ -114 +114 @@
 }
 
-static errno_t exfat_node_sync(exfat_node_t *node)
-{
-        errno_t rc;
+static int exfat_node_sync(exfat_node_t *node)
+{
+        int rc;
         exfat_directory_t di;
         exfat_file_dentry_t df;
@@ -155 +155 @@
 }
 
-static errno_t exfat_node_fini_by_service_id(service_id_t service_id)
-{
-        errno_t rc;
+static int exfat_node_fini_by_service_id(service_id_t service_id)
+{
+        int rc;
 
         /*
@@ -211 +211 @@
 }
 
-static errno_t exfat_node_get_new(exfat_node_t **nodepp)
+static int exfat_node_get_new(exfat_node_t **nodepp)
 {
         fs_node_t *fn;
         exfat_node_t *nodep;
-        errno_t rc;
+        int rc;
 
         fibril_mutex_lock(&ffn_mutex);
@@ -269 +269 @@
 }
 
-static errno_t exfat_node_get_new_by_pos(exfat_node_t **nodepp, 
+static int exfat_node_get_new_by_pos(exfat_node_t **nodepp, 
     service_id_t service_id, exfat_cluster_t pfc, unsigned pdi)
 {
@@ -287 +287 @@
  * @param idxp          Locked index structure.
  */
-static errno_t exfat_node_get_core(exfat_node_t **nodepp, exfat_idx_t *idxp)
+static int exfat_node_get_core(exfat_node_t **nodepp, exfat_idx_t *idxp)
 {
         exfat_dentry_t *d;
         exfat_node_t *nodep = NULL;
         exfat_directory_t di;
-        errno_t rc;
+        int rc;
 
         if (idxp->nodep) {
@@ -398 +398 @@
 }
 
-errno_t exfat_node_expand(service_id_t service_id, exfat_node_t *nodep,
+int exfat_node_expand(service_id_t service_id, exfat_node_t *nodep,
     exfat_cluster_t clusters)
 {
         exfat_bs_t *bs;
-        errno_t rc;
+        int rc;
         bs = block_bb_get(service_id);
 
@@ -443 +443 @@
 }
 
-static errno_t exfat_node_shrink(service_id_t service_id, exfat_node_t *nodep,
+static int exfat_node_shrink(service_id_t service_id, exfat_node_t *nodep,
     aoff64_t size)
 {
         exfat_bs_t *bs;
-        errno_t rc;
+        int rc;
         bs = block_bb_get(service_id);
 
@@ -491 +491 @@
  */
 
-errno_t exfat_root_get(fs_node_t **rfn, service_id_t service_id)
+int exfat_root_get(fs_node_t **rfn, service_id_t service_id)
 {
         return exfat_node_get(rfn, service_id, EXFAT_ROOT_IDX);
 }
 
-errno_t exfat_bitmap_get(fs_node_t **rfn, service_id_t service_id)
+int exfat_bitmap_get(fs_node_t **rfn, service_id_t service_id)
 {
         return exfat_node_get(rfn, service_id, EXFAT_BITMAP_IDX);
 }
 
-errno_t exfat_uctable_get(fs_node_t **rfn, service_id_t service_id)
+int exfat_uctable_get(fs_node_t **rfn, service_id_t service_id)
 {
         return exfat_node_get(rfn, service_id, EXFAT_UCTABLE_IDX);
@@ -507 +507 @@
 
 
-errno_t exfat_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)
+int exfat_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)
 {
         exfat_node_t *parentp = EXFAT_NODE(pfn);
@@ -514 +514 @@
         exfat_stream_dentry_t ds;
         service_id_t service_id;
-        errno_t rc;
+        int rc;
 
         fibril_mutex_lock(&parentp->idx->lock);
@@ -565 +565 @@
 
 /** Instantiate a exFAT in-core node. */
-errno_t exfat_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)
+int exfat_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)
 {
         exfat_node_t *nodep;
         exfat_idx_t *idxp;
-        errno_t rc;
+        int rc;
 
         idxp = exfat_idx_get_by_index(service_id, index);
@@ -584 +584 @@
 }
 
-errno_t exfat_node_open(fs_node_t *fn)
+int exfat_node_open(fs_node_t *fn)
 {
         /*
@@ -593 +593 @@
 }
 
-errno_t exfat_node_put(fs_node_t *fn)
+int exfat_node_put(fs_node_t *fn)
 {
         if (fn == NULL)
@@ -625 +625 @@
 }
 
-errno_t exfat_create_node(fs_node_t **rfn, service_id_t service_id, int flags)
+int exfat_create_node(fs_node_t **rfn, service_id_t service_id, int flags)
 {
         exfat_idx_t *idxp;
         exfat_node_t *nodep;
         exfat_bs_t *bs;
-        errno_t rc;
+        int rc;
 
         bs = block_bb_get(service_id);
@@ -677 +677 @@
 }
 
-errno_t exfat_destroy_node(fs_node_t *fn)
+int exfat_destroy_node(fs_node_t *fn)
 {
         exfat_node_t *nodep = EXFAT_NODE(fn);
         exfat_bs_t *bs;
         bool has_children;
-        errno_t rc;
+        int rc;
 
         /*
@@ -718 +718 @@
 }
 
-errno_t exfat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)
+int exfat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)
 {
         exfat_node_t *parentp = EXFAT_NODE(pfn);
         exfat_node_t *childp = EXFAT_NODE(cfn);
         exfat_directory_t di;
-        errno_t rc;
+        int rc;
 
         fibril_mutex_lock(&childp->lock);
@@ -783 +783 @@
 }
 
-errno_t exfat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
+int exfat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm)
 {
         exfat_node_t *parentp = EXFAT_NODE(pfn);
         exfat_node_t *childp = EXFAT_NODE(cfn);
         bool has_children;
-        errno_t rc;
+        int rc;
 
         if (!parentp)
@@ -838 +838 @@
 }
 
-errno_t exfat_has_children(bool *has_children, fs_node_t *fn)
+int exfat_has_children(bool *has_children, fs_node_t *fn)
 {
         exfat_directory_t di;
         exfat_dentry_t *d;
         exfat_node_t *nodep = EXFAT_NODE(fn);
-        errno_t rc;
+        int rc;
 
         *has_children = false;
@@ -915 +915 @@
 }
 
-errno_t exfat_size_block(service_id_t service_id, uint32_t *size)
+int exfat_size_block(service_id_t service_id, uint32_t *size)
 {
         exfat_bs_t *bs;
@@ -924 +924 @@
 }
 
-errno_t exfat_total_block_count(service_id_t service_id, uint64_t *count)
+int exfat_total_block_count(service_id_t service_id, uint64_t *count)
 {
         exfat_bs_t *bs;
@@ -933 +933 @@
 }
 
-errno_t exfat_free_block_count(service_id_t service_id, uint64_t *count)
+int exfat_free_block_count(service_id_t service_id, uint64_t *count)
 {
         fs_node_t *node = NULL;
@@ -941 +941 @@
         uint64_t block_count;
         unsigned sector;
-        errno_t rc;
+        int rc;
 
         rc = exfat_total_block_count(service_id, &block_count);
@@ -1015 +1015 @@
 };
 
-static errno_t exfat_fs_open(service_id_t service_id, enum cache_mode cmode,
+static int exfat_fs_open(service_id_t service_id, enum cache_mode cmode,
     fs_node_t **rrfn, exfat_idx_t **rridxp, vfs_fs_probe_info_t *info)
 {
-        errno_t rc;
+        int rc;
         exfat_node_t *rootp = NULL, *bitmapp = NULL, *uctablep = NULL;
         exfat_bs_t *bs;
@@ -1267 +1267 @@
 */
 
-static errno_t exfat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)
-{
-        errno_t rc;
+static int exfat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)
+{
+        int rc;
         exfat_idx_t *ridxp;
         fs_node_t *rfn;
@@ -1281 +1281 @@
 }
 
-static errno_t
+static int
 exfat_mounted(service_id_t service_id, const char *opts, fs_index_t *index,
     aoff64_t *size)
 {
-        errno_t rc;
+        int rc;
         enum cache_mode cmode;
         exfat_idx_t *ridxp;
@@ -1306 +1306 @@
 }
 
-static errno_t exfat_unmounted(service_id_t service_id)
+static int exfat_unmounted(service_id_t service_id)
 {
         fs_node_t *rfn;
-        errno_t rc;
+        int rc;
 
         rc = exfat_root_get(&rfn, service_id);
@@ -1319 +1319 @@
 }
 
-static errno_t
+static int
 exfat_read(service_id_t service_id, fs_index_t index, aoff64_t pos,
     size_t *rbytes)
@@ -1328 +1328 @@
         size_t bytes = 0;
         block_t *b;
-        errno_t rc;
+        int rc;
 
         rc = exfat_node_get(&fn, service_id, index);
@@ -1438 +1438 @@
 }
 
-static errno_t exfat_close(service_id_t service_id, fs_index_t index)
-{
-        return EOK;
-}
-
-static errno_t exfat_sync(service_id_t service_id, fs_index_t index)
+static int exfat_close(service_id_t service_id, fs_index_t index)
+{
+        return EOK;
+}
+
+static int exfat_sync(service_id_t service_id, fs_index_t index)
 {
         fs_node_t *fn;
-        errno_t rc = exfat_node_get(&fn, service_id, index);
+        int rc = exfat_node_get(&fn, service_id, index);
         if (rc != EOK)
                 return rc;
@@ -1461 +1461 @@
 }
 
-static errno_t
+static int
 exfat_write(service_id_t service_id, fs_index_t index, aoff64_t pos,
     size_t *wbytes, aoff64_t *nsize)
@@ -1472 +1472 @@
         aoff64_t boundary;
         int flags = BLOCK_FLAGS_NONE;
-        errno_t rc;
+        int rc;
 
         rc = exfat_node_get(&fn, service_id, index);
@@ -1548 +1548 @@
 }
 
-static errno_t
+static int
 exfat_truncate(service_id_t service_id, fs_index_t index, aoff64_t size)
 {
@@ -1554 +1554 @@
         exfat_node_t *nodep;
         exfat_bs_t *bs;
-        errno_t rc;
+        int rc;
 
         rc = exfat_node_get(&fn, service_id, index);
@@ -1584 +1584 @@
         }
 
-        errno_t rc2 = exfat_node_put(fn);
+        int rc2 = exfat_node_put(fn);
         if (rc == EOK && rc2 != EOK)
                 rc = rc2;
@@ -1591 +1591 @@
 }
 
-static errno_t exfat_destroy(service_id_t service_id, fs_index_t index)
+static int exfat_destroy(service_id_t service_id, fs_index_t index)
 {
         fs_node_t *fn;
         exfat_node_t *nodep;
-        errno_t rc;
+        int rc;
 
         rc = exfat_node_get(&fn, service_id, index);