Changeset e6edc8d1 in mainline for uspace/srv

Timestamp:

2013-07-11T19:13:37Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

67632f7

Parents:

52ff62d3 (diff), 2b3e8840 (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 with mainline changes.

Location:

uspace/srv/fs/mfs

Files:

• mfs.h (modified) (2 diffs)
• mfs_balloc.c (modified) (5 diffs)
• mfs_dentry.c (modified) (3 diffs)
• mfs_ops.c (modified) (15 diffs)

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" \
+                        printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
                         return -1;
@@ -135 +233 @@
                 /* bid == BMAP_INODE */
                 search = &sbi->isearch;
-                start_block = 2;
                 if (idx > sbi->ninodes) {
-                        printf(NAME ": Error! Trying to free beyond the" \
+                        printf(NAME ": Error! Trying to free beyond the "
                             "bitmap max size\n");
                         return -1;
@@ -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;
         }
         bits_per_block = sbi->block_size * 8;

uspace/srv/fs/mfs/mfs_dentry.c

@@ -36 +36 @@
  *
  * @param mnode         Pointer to the directory node.
- * @param d_info        Pointer to a directory entry structure where the dentry info
- *                      will be stored.
+ * @param d_info        Pointer to a directory entry structure where
+ *                      the dentry info will be stored.
  * @param index         index of the dentry in the list.
  *
@@ -101 +101 @@
 /**Write a directory entry on disk.
  *
- * @param d_info Pointer to the directory entry structure to write on disk.
+ * @param d_info The directory entry to write to disk.
  *
  * @return       EOK on success or a negative error code.
@@ -240 +240 @@
                                 goto out;
                         r = mfs_write_map(mnode, pos, b, &dummy);
-                        if (r != EOK)
+                        if (r != EOK) {
+                                mfs_free_zone(mnode->instance, b);
                                 goto out;
+                        }
                 }
 

uspace/srv/fs/mfs/mfs_ops.c

@@ -90 +90 @@
 
 /* Hash table interface for open nodes hash table */
-
 typedef struct {
         service_id_t service_id;
@@ -192 +191 @@
                 /* This is a V1 or V2 Minix filesystem */
                 magic = sb->s_magic;
-        } else if (check_magic_number(sb3->s_magic, &native, &version, &longnames)) {
+        } else if (check_magic_number(sb3->s_magic, &native,
+            &version, &longnames)) {
                 /* This is a V3 Minix filesystem */
                 magic = sb3->s_magic;
@@ -347 +347 @@
         uint32_t inum;
 
-        mfsdebug("%s()\n", __FUNCTION__);
-
         r = mfs_instance_get(service_id, &inst);
         if (r != EOK)
@@ -381 +379 @@
                 ino_i->i_mode = S_IFDIR;
                 ino_i->i_nlinks = 1; /* This accounts for the '.' dentry */
-        } else
+        } else {
                 ino_i->i_mode = S_IFREG;
+                ino_i->i_nlinks = 0;
+        }
 
         ino_i->i_uid = 0;
@@ -421 +421 @@
         free(ino_i);
 out_err:
+        mfs_free_inode(inst, inum);
         return r;
 }
@@ -431 +432 @@
         struct mfs_dentry_info d_info;
         int r;
-
-        mfsdebug("%s()\n", __FUNCTION__);
 
         if (!S_ISDIR(ino_i->i_mode))
@@ -480 +479 @@
         struct mfs_instance *instance;
 
-        mfsdebug("%s()\n", __FUNCTION__);
-
         rc = mfs_instance_get(service_id, &instance);
         if (rc != EOK)
@@ -494 +491 @@
         int rc = EOK;
         struct mfs_node *mnode = fsnode->data;
-
-        mfsdebug("%s()\n", __FUNCTION__);
 
         fibril_mutex_lock(&open_nodes_lock);
@@ -556 +551 @@
         int rc;
 
-        mfsdebug("%s()\n", __FUNCTION__);
-
         fibril_mutex_lock(&open_nodes_lock);
 
@@ -570 +563 @@
         if (already_open) {
                 mnode = hash_table_get_inst(already_open, struct mfs_node, link);
+
                 *rfn = mnode->fsnode;
                 mnode->refcnt++;
@@ -651 +645 @@
         bool destroy_dentry = false;
 
-        mfsdebug("%s()\n", __FUNCTION__);
-
         if (str_size(name) > sbi->max_name_len)
                 return ENAMETOOLONG;
@@ -675 +667 @@
                 r = mfs_insert_dentry(child, "..", parent->ino_i->index);
                 if (r != EOK) {
+                        mfs_remove_dentry(child, ".");
                         destroy_dentry = true;
                         goto exit;
@@ -702 +695 @@
         bool has_children;
         int r;
-
-        mfsdebug("%s()\n", __FUNCTION__);
 
         if (!parent)
@@ -926 +917 @@
                 
                 r = mfs_write_map(mnode, pos, block, &dummy);
-                if (r != EOK)
+                if (r != EOK) {
+                        mfs_free_zone(mnode->instance, block);
                         goto out_err;
+                }
 
                 flags = BLOCK_FLAGS_NOREAD;
@@ -967 +960 @@
 mfs_destroy(service_id_t service_id, fs_index_t index)
 {
-        fs_node_t *fn;
+        fs_node_t *fn = NULL;
         int r;