Changeset 758f8d5 in mainline for uspace/srv/fs

Timestamp:

2013-09-11T21:53:36Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e1ec5a2

Parents:

1e371cf (diff), 9dbdda9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge the df branch

Location:

uspace/srv/fs

Files:

• cdfs/cdfs_ops.c (modified) (2 diffs)
• exfat/exfat_ops.c (modified) (3 diffs)
• ext4fs/ext4fs_ops.c (modified) (3 diffs)
• fat/fat_ops.c (modified) (3 diffs)
• mfs/mfs.h (modified) (2 diffs)
• mfs/mfs_balloc.c (modified) (5 diffs)
• mfs/mfs_ops.c (modified) (3 diffs)
• udf/udf_ops.c (modified) (2 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -619 +619 @@
 }
 
+static int cdfs_size_block(service_id_t service_id, uint32_t *size)
+{
+        *size = BLOCK_SIZE;
+
+        return EOK; 
+}
+
+static int cdfs_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        *count = 0;
+        
+        return EOK;
+}
+
+static int cdfs_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        *count = 0;
+        
+        return EOK;
+}
+
 libfs_ops_t cdfs_libfs_ops = {
         .root_get = cdfs_root_get,
@@ -635 +656 @@
         .is_directory = cdfs_is_directory,
         .is_file = cdfs_is_file,
-        .service_get = cdfs_service_get
+        .service_get = cdfs_service_get,
+        .size_block = cdfs_size_block,
+        .total_block_count = cdfs_total_block_count,
+        .free_block_count = cdfs_free_block_count
 };
 

uspace/srv/fs/exfat/exfat_ops.c

@@ -89 +89 @@
 static bool exfat_is_file(fs_node_t *node);
 static service_id_t exfat_service_get(fs_node_t *node);
+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 *);
 
 /*
@@ -910 +913 @@
 }
 
+int exfat_size_block(service_id_t service_id, uint32_t *size)
+{
+        exfat_bs_t *bs;
+        bs = block_bb_get(service_id);
+        *size = BPC(bs);
+
+        return EOK;
+}
+
+int exfat_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        exfat_bs_t *bs;
+        bs = block_bb_get(service_id);
+        *count = DATA_CNT(bs);
+        
+        return EOK;
+}
+
+int exfat_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        fs_node_t *node;
+        exfat_node_t *bmap_node;
+        exfat_bs_t *bs;
+        uint64_t free_block_count = 0;
+        uint64_t block_count;
+        unsigned sector;
+        int rc;
+
+        rc = exfat_total_block_count(service_id, &block_count);
+        if (rc != EOK)
+                goto exit;
+
+        bs = block_bb_get(service_id);
+        node = NULL;
+        rc = exfat_bitmap_get(&node, service_id);
+        if (rc != EOK)
+                goto exit;
+
+        bmap_node = (exfat_node_t *) node->data;
+
+        unsigned const bmap_sectors = ROUND_UP(bmap_node->size, BPS(bs)) /
+            BPS(bs);
+
+        for (sector = 0; sector < bmap_sectors; ++sector) {
+
+                block_t *block;
+                uint8_t *bitmap;
+                unsigned bit;
+
+                rc = exfat_block_get(&block, bs, bmap_node, sector,
+                    BLOCK_FLAGS_NONE);
+                if (rc != EOK) {
+                        free_block_count = 0;
+                        goto exit;
+                }
+
+                bitmap = (uint8_t *) block->data;
+
+                for (bit = 0; bit < BPS(bs) * 8 && block_count > 0;
+                    ++bit, --block_count) {
+                        if (!(bitmap[bit / 8] & (1 << (bit % 8))))
+                                ++free_block_count;
+                }
+
+                block_put(block);
+
+                if (block_count == 0) {
+                        /* Reached the end of the bitmap */
+                        goto exit;
+                }
+        }
+
+exit:
+        exfat_node_put(node);
+        *count = free_block_count;
+        return rc;
+}
 
 /** libfs operations */
@@ -928 +1008 @@
         .is_directory = exfat_is_directory,
         .is_file = exfat_is_file,
-        .service_get = exfat_service_get
+        .service_get = exfat_service_get,
+        .size_block = exfat_size_block,
+        .total_block_count = exfat_total_block_count,
+        .free_block_count = exfat_free_block_count
 };
 

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -101 +101 @@
 static bool ext4fs_is_file(fs_node_t *node);
 static service_id_t ext4fs_service_get(fs_node_t *node);
+static int ext4fs_size_block(service_id_t, uint32_t *);
+static int ext4fs_total_block_count(service_id_t, uint64_t *);
+static int ext4fs_free_block_count(service_id_t, uint64_t *);
 
 /* Static variables */
@@ -833 +836 @@
         ext4fs_node_t *enode = EXT4FS_NODE(fn);
         return enode->instance->service_id;
+}
+
+int ext4fs_size_block(service_id_t service_id, uint32_t *size)
+{
+        ext4fs_instance_t *inst;
+        int rc = ext4fs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+
+        ext4_superblock_t *sb = inst->filesystem->superblock;
+        *size = ext4_superblock_get_block_size(sb);
+
+        return EOK;
+}
+
+int ext4fs_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        ext4fs_instance_t *inst;
+        int rc = ext4fs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+
+        ext4_superblock_t *sb = inst->filesystem->superblock;
+        *count = ext4_superblock_get_blocks_count(sb);
+
+        return EOK;
+}
+
+int ext4fs_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        ext4fs_instance_t *inst;
+        int rc = ext4fs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+        if (NULL == inst)
+                return ENOENT;
+
+        ext4_superblock_t *sb = inst->filesystem->superblock;
+        *count = ext4_superblock_get_free_blocks_count(sb);
+
+        return EOK;
 }
 
@@ -854 +904 @@
         .is_directory = ext4fs_is_directory,
         .is_file = ext4fs_is_file,
-        .service_get = ext4fs_service_get
+        .service_get = ext4fs_service_get,
+        .size_block = ext4fs_size_block,
+        .total_block_count = ext4fs_total_block_count,
+        .free_block_count = ext4fs_free_block_count
 };
 

uspace/srv/fs/fat/fat_ops.c

@@ -91 +91 @@
 static bool fat_is_file(fs_node_t *node);
 static service_id_t fat_service_get(fs_node_t *node);
+static int fat_size_block(service_id_t, uint32_t *);
+static int fat_total_block_count(service_id_t, uint64_t *);
+static int fat_free_block_count(service_id_t, uint64_t *);
 
 /*
@@ -841 +844 @@
 }
 
+int fat_size_block(service_id_t service_id, uint32_t *size)
+{
+        fat_bs_t *bs;
+
+        bs = block_bb_get(service_id);
+        *size = BPC(bs);
+
+        return EOK;
+}
+
+int fat_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        fat_bs_t *bs;
+        
+        bs = block_bb_get(service_id);
+        *count = (SPC(bs)) ? TS(bs) / SPC(bs) : 0;
+
+        return EOK;
+}
+
+int fat_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        fat_bs_t *bs;
+        fat_cluster_t e0;
+        uint64_t block_count;
+        int rc;
+        uint32_t cluster_no, clusters;
+
+        block_count = 0;
+        bs = block_bb_get(service_id);
+        clusters = (SPC(bs)) ? TS(bs) / SPC(bs) : 0;
+        for (cluster_no = 0; cluster_no < clusters; cluster_no++) {
+                rc = fat_get_cluster(bs, service_id, FAT1, cluster_no, &e0);
+                if (rc != EOK)
+                        return EIO;
+
+                if (e0 == FAT_CLST_RES0)
+                        block_count++;
+        }
+        *count = block_count;
+        
+        return EOK;
+}
+
 /** libfs operations */
 libfs_ops_t fat_libfs_ops = {
@@ -858 +905 @@
         .is_directory = fat_is_directory,
         .is_file = fat_is_file,
-        .service_get = fat_service_get
+        .service_get = fat_service_get,
+        .size_block = fat_size_block,
+        .total_block_count = fat_total_block_count,
+        .free_block_count = fat_free_block_count
 };
 

uspace/srv/fs/mfs/mfs.h

@@ -58 +58 @@
 #endif
 
+#define MFS_BMAP_START_BLOCK(sbi, bid) \
+    ((bid) == BMAP_ZONE ? 2 + (sbi)->ibmap_blocks : 2)
+
+#define MFS_BMAP_SIZE_BITS(sbi, bid) \
+    ((bid) == BMAP_ZONE ? (sbi)->nzones - (sbi)->firstdatazone - 1 : \
+    (sbi)->ninodes - 1)
+
+#define MFS_BMAP_SIZE_BLOCKS(sbi, bid) \
+    ((bid) == BMAP_ZONE ? (sbi)->zbmap_blocks : (sbi)->ibmap_blocks)
+
 typedef uint32_t bitchunk_t;
 
@@ -201 +211 @@
 mfs_free_zone(struct mfs_instance *inst, uint32_t zone);
 
+extern int
+mfs_count_free_zones(struct mfs_instance *inst, uint32_t *zones);
+
+extern int
+mfs_count_free_inodes(struct mfs_instance *inst, uint32_t *inodes);
+
+
 /* mfs_utils.c */
 extern uint16_t

uspace/srv/fs/mfs/mfs_balloc.c

@@ -44 +44 @@
 mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid);
 
+static int
+mfs_count_free_bits(struct mfs_instance *inst, bmap_id_t bid, uint32_t *free);
+
+
 /**Allocate a new inode.
  *
@@ -102 +106 @@
 
         return mfs_free_bit(inst, zone, BMAP_ZONE);
+}
+
+/** Count the number of free zones
+ *
+ * @param inst          Pointer to the instance structure.
+ * @param zones         Pointer to the memory location where the result
+ *                      will be stored.
+ *
+ * @return              EOK on success or a negative error code.
+ */
+int
+mfs_count_free_zones(struct mfs_instance *inst, uint32_t *zones)
+{
+        return mfs_count_free_bits(inst, BMAP_ZONE, zones);
+}
+
+/** Count the number of free inodes
+ *
+ * @param inst          Pointer to the instance structure.
+ * @param zones         Pointer to the memory location where the result
+ *                      will be stored.
+ *
+ * @return              EOK on success or a negative error code.
+ */
+
+int
+mfs_count_free_inodes(struct mfs_instance *inst, uint32_t *inodes)
+{
+        return mfs_count_free_bits(inst, BMAP_INODE, inodes);
+}
+
+/** Count the number of free bits in a bitmap
+ *
+ * @param inst          Pointer to the instance structure.
+ * @param bid           Type of the bitmap (inode or zone).
+ * @param free          Pointer to the memory location where the result
+ *                      will be stores.
+ *
+ * @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)
+{
+        int r;
+        unsigned start_block;
+        unsigned long nblocks;
+        unsigned long nbits;
+        unsigned long block;
+        unsigned long free_bits = 0;
+        bitchunk_t chunk;
+        size_t const bitchunk_bits = sizeof(bitchunk_t) * 8;
+        block_t *b;
+        struct mfs_sb_info *sbi = inst->sbi;
+
+        start_block = MFS_BMAP_START_BLOCK(sbi, bid);
+        nblocks = MFS_BMAP_SIZE_BLOCKS(sbi, bid);
+        nbits = MFS_BMAP_SIZE_BITS(sbi, bid);
+
+        for (block = 0; block < nblocks; ++block) {
+                r = block_get(&b, inst->service_id, block + start_block,
+                    BLOCK_FLAGS_NONE);
+                if (r != EOK)
+                        return r;
+
+                size_t i;
+                bitchunk_t *data = (bitchunk_t *) b->data;
+
+                /* Read the bitmap block, chunk per chunk,
+                 * counting the zero bits.
+                 */
+                for (i = 0; i < sbi->block_size / sizeof(bitchunk_t); ++i) {
+                        chunk = conv32(sbi->native, data[i]);
+
+                        size_t bit;
+                        for (bit = 0; bit < bitchunk_bits && nbits > 0;
+                            ++bit, --nbits) {
+                                if (!(chunk & (1 << bit)))
+                                        free_bits++;
+                        }
+
+                        if (nbits == 0)
+                                break;
+                }
+
+                r = block_put(b);
+                if (r != EOK)
+                        return r;
+        }
+
+        *free = free_bits;
+        assert(nbits == 0);
+
+        return EOK;
 }
 
@@ -124 +221 @@
         sbi = inst->sbi;
 
+        start_block = MFS_BMAP_START_BLOCK(sbi, bid);
+
         if (bid == BMAP_ZONE) {
                 search = &sbi->zsearch;
-                start_block = 2 + sbi->ibmap_blocks;
                 if (idx > sbi->nzones) {
                         printf(NAME ": Error! Trying to free beyond the "
@@ -135 +233 @@
                 /* bid == BMAP_INODE */
                 search = &sbi->isearch;
-                start_block = 2;
                 if (idx > sbi->ninodes) {
                         printf(NAME ": Error! Trying to free beyond the "
@@ -192 +289 @@
         sbi = inst->sbi;
 
+        start_block = MFS_BMAP_START_BLOCK(sbi, bid);
+        limit = MFS_BMAP_SIZE_BITS(sbi, bid);
+        nblocks = MFS_BMAP_SIZE_BLOCKS(sbi, bid);
+
         if (bid == BMAP_ZONE) {
                 search = &sbi->zsearch;
-                start_block = 2 + sbi->ibmap_blocks;
-                nblocks = sbi->zbmap_blocks;
-                limit = sbi->nzones - sbi->firstdatazone - 1;
         } else {
                 /* bid == BMAP_INODE */
                 search = &sbi->isearch;
-                start_block = 2;
-                nblocks = sbi->ibmap_blocks;
-                limit = sbi->ninodes - 1;
         }
         bits_per_block = sbi->block_size * 8;

uspace/srv/fs/mfs/mfs_ops.c

@@ -64 +64 @@
 static int mfs_check_sanity(struct mfs_sb_info *sbi);
 static bool is_power_of_two(uint32_t n);
+static int mfs_size_block(service_id_t service_id, uint32_t *size);
+static int mfs_total_block_count(service_id_t service_id, uint64_t *count);
+static int mfs_free_block_count(service_id_t service_id, uint64_t *count);
 
 static hash_table_t open_nodes;
@@ -84 +87 @@
         .destroy = mfs_destroy_node,
         .has_children = mfs_has_children,
-        .lnkcnt_get = mfs_lnkcnt_get
+        .lnkcnt_get = mfs_lnkcnt_get,
+        .size_block = mfs_size_block,
+        .total_block_count = mfs_total_block_count,
+        .free_block_count = mfs_free_block_count
 };
 
@@ -1129 +1135 @@
 }
 
+static int
+mfs_size_block(service_id_t service_id, uint32_t *size)
+{
+        struct mfs_instance *inst;
+        int rc;
+
+        rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+        
+        *size = inst->sbi->block_size;
+
+        return EOK;
+}
+
+static int
+mfs_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        struct mfs_instance *inst;
+        int rc;
+        
+        rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+        
+        *count = (uint64_t) MFS_BMAP_SIZE_BITS(inst->sbi, BMAP_ZONE);
+
+        return EOK;
+}
+
+static int
+mfs_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        uint32_t block_free;
+        
+        struct mfs_instance *inst;
+        int rc = mfs_instance_get(service_id, &inst);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == inst)
+                return ENOENT;
+
+        mfs_count_free_zones(inst, &block_free);
+        *count = block_free;
+
+        return EOK;
+}
+
 vfs_out_ops_t mfs_ops = {
         .mounted = mfs_mounted,

uspace/srv/fs/udf/udf_ops.c

@@ -249 +249 @@
 }
 
+static int udf_size_block(service_id_t service_id, uint32_t *size)
+{
+        udf_instance_t *instance;
+        int rc = fs_instance_get(service_id, (void **) &instance);
+        if (rc != EOK)
+                return rc;
+
+        if (NULL == instance)
+                return ENOENT;
+        
+        *size = instance->volumes[DEFAULT_VOL].logical_block_size;
+        
+        return EOK;
+}
+
+static int udf_total_block_count(service_id_t service_id, uint64_t *count)
+{
+        *count = 0;
+        
+        return EOK;
+}
+
+static int udf_free_block_count(service_id_t service_id, uint64_t *count)
+{
+        *count = 0;
+        
+        return EOK;
+}
+
 libfs_ops_t udf_libfs_ops = {
         .root_get = udf_root_get,
@@ -265 +294 @@
         .is_directory = udf_is_directory,
         .is_file = udf_is_file,
-        .service_get = udf_service_get
+        .service_get = udf_service_get,
+        .size_block = udf_size_block,
+        .total_block_count = udf_total_block_count,
+        .free_block_count = udf_free_block_count
 };