Changeset 038b289 in mainline

Timestamp:

2011-09-06T23:34:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

888207c9, c05642d, c0e53ff

Parents:

7e9fce6 (diff), fb7e5a9a (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 MFS improvements from lp:mfs.

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/mkmfs/Makefile (moved) (moved from uspace/app/mkminix/Makefile ) (1 diff)
• uspace/app/mkmfs/mkmfs.c (moved) (moved from uspace/app/mkminix/mkminix.c ) (7 diffs)
• uspace/srv/fs/mfs/Makefile (moved) (moved from uspace/srv/fs/minixfs/Makefile )
• uspace/srv/fs/mfs/mfs.c (moved) (moved from uspace/srv/fs/minixfs/mfs.c )
• uspace/srv/fs/mfs/mfs.h (moved) (moved from uspace/srv/fs/minixfs/mfs.h )
• uspace/srv/fs/mfs/mfs_balloc.c (moved) (moved from uspace/srv/fs/minixfs/mfs_balloc.c ) (3 diffs)
• uspace/srv/fs/mfs/mfs_dentry.c (moved) (moved from uspace/srv/fs/minixfs/mfs_dentry.c )
• uspace/srv/fs/mfs/mfs_inode.c (moved) (moved from uspace/srv/fs/minixfs/mfs_inode.c )
• uspace/srv/fs/mfs/mfs_ops.c (moved) (moved from uspace/srv/fs/minixfs/mfs_ops.c )
• uspace/srv/fs/mfs/mfs_rw.c (moved) (moved from uspace/srv/fs/minixfs/mfs_rw.c ) (7 diffs)
• uspace/srv/fs/mfs/mfs_utils.c (moved) (moved from uspace/srv/fs/minixfs/mfs_utils.c )

boot/Makefile.common

@@ -102 +102 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
+        $(USPACE_PATH)/srv/fs/mfs/mfs \
         $(USPACE_PATH)/srv/fs/cdfs/cdfs \
-        $(USPACE_PATH)/srv/fs/minixfs/mfs \
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
@@ -156 +156 @@
         $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
-        $(USPACE_PATH)/app/mkminix/mkminix \
+        $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \

uspace/Makefile

@@ -48 +48 @@
         app/lsusb \
         app/mkfat \
-        app/mkminix \
+        app/mkmfs \
         app/redir \
         app/sbi \
@@ -84 +84 @@
         srv/fs/cdfs \
         srv/fs/tmpfs \
-        srv/fs/minixfs \
+        srv/fs/mfs \
         srv/fs/locfs \
         srv/fs/ext2fs \

uspace/app/mkmfs/Makefile

@@ -31 +31 @@
 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBMINIX_PREFIX)
-BINARY = mkminix
+BINARY = mkmfs
 
 SOURCES = \
-        mkminix.c
+        mkmfs.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/mkmfs/mkmfs.c

@@ -33 +33 @@
 
 /**
- * @file        mkminix.c
+ * @file        mkmfs.c
  * @brief       Tool for creating new Minix file systems.
  *
@@ -51 +51 @@
 #include <minix.h>
 
-#define NAME    "mkminix"
+#define NAME    "mkmfs"
 
 #define FREE    0
@@ -83 +83 @@
 };
 
-static void     help_cmd_mkminix(help_level_t level);
+static void     help_cmd_mkmfs(help_level_t level);
 static int      num_of_set_bits(uint32_t n);
 static int      init_superblock(struct mfs_sb_info *sb);
@@ -130 +130 @@
 
         if (argc == 1) {
-                help_cmd_mkminix(HELP_SHORT);
-                printf("Incorrect number of arguments, try `mkminix --help'\n");
+                help_cmd_mkmfs(HELP_SHORT);
+                printf("Incorrect number of arguments, try `mkmfs --help'\n");
                 exit(0);
         }
@@ -139 +139 @@
                 switch (c) {
                 case 'h':
-                        help_cmd_mkminix(HELP_LONG);
+                        help_cmd_mkmfs(HELP_LONG);
                         exit(0);
                 case '1':
@@ -197 +197 @@
 
         if (!device_name) {
-                help_cmd_mkminix(HELP_LONG);
+                help_cmd_mkmfs(HELP_LONG);
                 exit(0);
         }
@@ -705 +705 @@
 }
 
-static void help_cmd_mkminix(help_level_t level)
+static void help_cmd_mkmfs(help_level_t level)
 {
         if (level == HELP_SHORT) {

uspace/srv/fs/mfs/mfs_balloc.c

@@ -56 +56 @@
 {
         int r = mfs_alloc_bit(inst, inum, BMAP_INODE);
-
-        *inum += 1;
         return r;
 }
@@ -71 +69 @@
 mfs_free_inode(struct mfs_instance *inst, uint32_t inum)
 {
-        return mfs_free_bit(inst, inum - 1, BMAP_INODE);
+        return mfs_free_bit(inst, inum, BMAP_INODE);
 }
 
@@ -202 +200 @@
                 start_block = 2 + sbi->ibmap_blocks;
                 nblocks = sbi->zbmap_blocks;
-                limit = sbi->nzones;
+                limit = sbi->nzones - sbi->firstdatazone - 1;
         } else {
                 /*bid == BMAP_INODE*/

uspace/srv/fs/mfs/mfs_rw.c

@@ -83 +83 @@
         const struct mfs_sb_info *sbi = mnode->instance->sbi;
 
+        if (pos >= sbi->max_file_size) {
+                /*Can't write beyond the maximum file size*/
+                return EINVAL;
+        }
+
         /*Compute the relative block number in file*/
         int rblock = pos / sbi->block_size;
@@ -97 +102 @@
         uint32_t *ind_zone, *ind2_zone;
 
-        assert(mnode);
         struct mfs_ino_info *ino_i = mnode->ino_i;
-
-        assert(ino_i);
-        assert(mnode->instance);
-
         struct mfs_instance *inst = mnode->instance;
         struct mfs_sb_info *sbi = inst->sbi;
-        assert(sbi);
 
         const mfs_version_t fs_version = sbi->fs_version;
+        const bool deleting = write_mode && (w_block == 0);
 
         if (fs_version == MFS_VERSION_V1) {
@@ -132 +132 @@
                 /*The wanted block is in the single indirect zone chain*/
                 if (ino_i->i_izone[0] == 0) {
-                        if (write_mode) {
+                        if (write_mode && !deleting) {
                                 uint32_t zone;
                                 r = alloc_zone_and_clear(inst, &zone);
@@ -166 +166 @@
         /*read the first indirect zone of the chain*/
         if (ino_i->i_izone[1] == 0) {
-                if (write_mode) {
+                if (write_mode && !deleting) {
                         uint32_t zone;
                         r = alloc_zone_and_clear(inst, &zone);
@@ -193 +193 @@
         /*read the second indirect zone of the chain*/
         if (ind_zone[ind2_off] == 0) {
-                if (write_mode) {
+                if (write_mode && !deleting) {
                         uint32_t zone;
                         r = alloc_zone_and_clear(inst, &zone);
@@ -213 +213 @@
                 goto out_free_ind1;
 
-        *b = ind2_zone[ind2_off % ptrs_per_block];
+        *b = ind2_zone[rblock - (ind2_off * ptrs_per_block)];
         if (write_mode) {
-                ind2_zone[ind2_off % ptrs_per_block] = w_block;
+                ind2_zone[rblock - (ind2_off * ptrs_per_block)] = w_block;
                 write_ind_zone(inst, ind_zone[ind2_off], ind2_zone);
         }
@@ -371 +371 @@
         block_t *b;
 
-        r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NONE);
+        r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NOREAD);
         if (r != EOK)
                 return r;