Changes in uspace/srv/fs/mfs/mfs_balloc.c [b7fd2a0:1eaa3cf] in mainline

File:

• uspace/srv/fs/mfs/mfs_balloc.c (modified) (13 diffs)

uspace/srv/fs/mfs/mfs_balloc.c

@@ -38 +38 @@
     const bool native, unsigned start_bit);
 
-static errno_t
+static int
 mfs_free_bit(struct mfs_instance *inst, uint32_t idx, bmap_id_t bid);
 
-static errno_t
+static int
 mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid);
 
-static errno_t
+static int
 mfs_count_free_bits(struct mfs_instance *inst, bmap_id_t bid, uint32_t *free);
 
@@ -54 +54 @@
  *                      the new inode will be saved.
  *
- * @return              EOK on success or an error code.
- */
-errno_t
+ * @return              EOK on success or a negative error code.
+ */
+int
 mfs_alloc_inode(struct mfs_instance *inst, uint32_t *inum)
 {
-        errno_t r = mfs_alloc_bit(inst, inum, BMAP_INODE);
+        int r = mfs_alloc_bit(inst, inum, BMAP_INODE);
         return r;
 }
@@ -68 +68 @@
  * @param inum          Number of the inode to free.
  *
- * @return              EOK on success or an error code.
- */
-errno_t
+ * @return              EOK on success or a negative error code.
+ */
+int
 mfs_free_inode(struct mfs_instance *inst, uint32_t inum)
 {
@@ -82 +82 @@
  *                      of the zone will be saved.
  *
- * @return              EOK on success or an error code.
- */
-errno_t
+ * @return              EOK on success or a negative error code.
+ */
+int
 mfs_alloc_zone(struct mfs_instance *inst, uint32_t *zone)
 {
-        errno_t r = mfs_alloc_bit(inst, zone, BMAP_ZONE);
+        int r = mfs_alloc_bit(inst, zone, BMAP_ZONE);
         if (r != EOK)
                 return r;
@@ -105 +105 @@
  * @param zone          Index of the zone to free.
  *
- * @return              EOK on success or an error code.
- */
-errno_t
+ * @return              EOK on success or a negative error code.
+ */
+int
 mfs_free_zone(struct mfs_instance *inst, uint32_t zone)
 {
-        errno_t r;
+        int r;
 
         zone -= inst->sbi->firstdatazone - 1;
@@ -132 +132 @@
  *                      will be stored.
  *
- * @return              EOK on success or an error code.
- */
-errno_t
+ * @return              EOK on success or a negative error code.
+ */
+int
 mfs_count_free_zones(struct mfs_instance *inst, uint32_t *zones)
 {
@@ -146 +146 @@
  *                      will be stored.
  *
- * @return              EOK on success or an error code.
- */
-
-errno_t
+ * @return              EOK on success or a negative error code.
+ */
+
+int
 mfs_count_free_inodes(struct mfs_instance *inst, uint32_t *inodes)
 {
@@ -162 +162 @@
  *                      will be stores.
  *
- * @return              EOK on success or an error code.
- */
-static errno_t
+ * @return              EOK on success or a negative error code.
+ */
+static int
 mfs_count_free_bits(struct mfs_instance *inst, bmap_id_t bid, uint32_t *free)
 {
-        errno_t r;
+        int r;
         unsigned start_block;
         unsigned long nblocks;
@@ -226 +226 @@
  *                      BMAP_INODE if operating on the inode's bitmap.
  *
- * @return              EOK on success or an error code.
- */
-static errno_t
+ * @return              EOK on success or a negative error code.
+ */
+static int
 mfs_free_bit(struct mfs_instance *inst, uint32_t idx, bmap_id_t bid)
 {
         struct mfs_sb_info *sbi;
-        errno_t r;
+        int r;
         unsigned start_block;
         unsigned *search;
@@ -246 +246 @@
                         printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
-                        return EIO;
+                        return -1;
                 }
         } else {
@@ -254 +254 @@
                         printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
-                        return EIO;
+                        return -1;
                 }
         }
@@ -293 +293 @@
  *                      BMAP_INODE if operating on the inode's bitmap.
  *
- * @return              EOK on success or an error code.
- */
-static errno_t
+ * @return              EOK on success or a negative error code.
+ */
+static int
 mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid)
 {
@@ -303 +303 @@
         unsigned *search, i, start_block;
         unsigned bits_per_block;
-        errno_t r;
-        int freebit;
+        int r, freebit;
 
         sbi = inst->sbi;