Changes in uspace/srv/fs/mfs/mfs_rw.c [b7fd2a0:95027b5] in mainline

File:

• uspace/srv/fs/mfs/mfs_rw.c (modified) (11 diffs)

uspace/srv/fs/mfs/mfs_rw.c

@@ -34 +34 @@
 #include "mfs.h"
 
-static errno_t
+static int
 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock,
     bool write_mode, uint32_t w_block);
 
-static errno_t
+static int
 reset_zone_content(struct mfs_instance *inst, uint32_t zone);
 
-static errno_t
+static int
 alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *zone);
 
-static errno_t
+static int
 read_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t **ind_zone);
 
-static errno_t
+static int
 write_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t *ind_zone);
 
@@ -59 +59 @@
  * @param pos   Position in file.
  *
- * @return      EOK on success or an error code.
+ * @return      EOK on success or a negative error code.
  */
-errno_t
+int
 mfs_read_map(uint32_t *b, const struct mfs_node *mnode, uint32_t pos)
 {
-        errno_t r;
+        int r;
         const struct mfs_sb_info *sbi = mnode->instance->sbi;
         const int block_size = sbi->block_size;
@@ -83 +83 @@
 }
 
-errno_t
+int
 mfs_write_map(struct mfs_node *mnode, const uint32_t pos, uint32_t new_zone,
     uint32_t *old_zone)
@@ -100 +100 @@
 }
 
-static errno_t
+static int
 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock,
     bool write_mode, uint32_t w_block)
@@ -107 +107 @@
         int ptrs_per_block;
         uint32_t *ind_zone = NULL, *ind2_zone = NULL;
-        errno_t r = EOK;
+        int r = EOK;
 
         struct mfs_ino_info *ino_i = mnode->ino_i;
@@ -236 +236 @@
  * @param new_size      The new size of the inode.
  *
- * @return              EOK on success or an error code.
+ * @return              EOK on success or a negative error code.
  */
-errno_t
+int
 mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size)
 {
@@ -244 +244 @@
         struct mfs_sb_info *sbi = inst->sbi;
         struct mfs_ino_info *ino_i = mnode->ino_i;
-        int nr_direct, ptrs_per_block, rblock;
-        errno_t r;
+        int nr_direct, ptrs_per_block, rblock, r;
         int i;
 
@@ -312 +311 @@
 }
 
-static errno_t
+static int
 reset_zone_content(struct mfs_instance *inst, uint32_t zone)
 {
         block_t *b;
-        errno_t r;
+        int r;
 
         r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NOREAD);
@@ -328 +327 @@
 }
 
-static errno_t
+static int
 alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *zone)
 {
-        errno_t r;
+        int r;
 
         r = mfs_alloc_zone(inst, zone);
@@ -341 +340 @@
 }
 
-static errno_t
+static int
 read_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t **ind_zone)
 {
         struct mfs_sb_info *sbi = inst->sbi;
-        errno_t r;
+        int r;
         unsigned i;
         block_t *b;
@@ -376 +375 @@
 }
 
-static errno_t
+static int
 write_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t *ind_zone)
 {
         struct mfs_sb_info *sbi = inst->sbi;
-        errno_t r;
+        int r;
         unsigned i;
         block_t *b;