Changes in / [3149fc0:a60b2d7] in mainline

Location:

uspace

Files:

• lib/libblock/libblock.c (modified) (3 diffs)
• srv/bd/file_bd/file_bd.c (modified) (1 diff)
• srv/fs/fat/fat_fat.c (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)

uspace/lib/libblock/libblock.c

@@ -52 +52 @@
 #include <macros.h>
 #include <mem.h>
-#include <sys/typefmt.h>
-#include <stacktrace.h>
 
 /** Lock protecting the device connection list */
@@ -815 +813 @@
         rc = async_req_3_0(devcon->dev_phone, BD_READ_BLOCKS, LOWER32(ba),
             UPPER32(ba), cnt);
-        if (rc != EOK) {
-                printf("Error %d reading %d blocks starting at block %" PRIuBN
-                    " from device handle %d\n", rc, cnt, ba,
-                    devcon->dev_handle);
-#ifndef NDEBUG
-                stacktrace_print();
-#endif
-        }
         return rc;
 }
@@ -842 +832 @@
         rc = async_req_3_0(devcon->dev_phone, BD_WRITE_BLOCKS, LOWER32(ba),
             UPPER32(ba), cnt);
-        if (rc != EOK) {
-                printf("Error %d writing %d blocks starting at block %" PRIuBN
-                    " to device handle %d\n", rc, cnt, ba, devcon->dev_handle);
-#ifndef NDEBUG
-                stacktrace_print();
-#endif
-        }
         return rc;
 }

uspace/srv/bd/file_bd/file_bd.c

@@ -249 +249 @@
         if (ba + cnt > num_blocks) {
                 printf(NAME ": Accessed blocks %" PRIuBN "-%" PRIuBN ", while "
-                    "max block number is %" PRIuBN ".\n", ba, ba + cnt - 1,
+                    "max block numeber is %" PRIuBN ".\n", ba, ba + cnt - 1,
                     num_blocks - 1);
                 return ELIMIT;

uspace/srv/fs/fat/fat_fat.c

@@ -147 +147 @@
         fat_cluster_t lastc;
         int rc;
-
-        /*
-         * This function can only operate on non-zero length files.
-         */
-        if (firstc == FAT_CLST_RES0)
-                return ELIMIT;
 
         bps = uint16_t_le2host(bs->bps);

uspace/srv/fs/fat/fat_ops.c

@@ -722 +722 @@
         fibril_mutex_lock(&childp->idx->lock);
         
-        if (childp->type == FAT_DIRECTORY) {
+        /*
+         * If possible, create the Sub-directory Identifier Entry and the
+         * Sub-directory Parent Pointer Entry (i.e. "." and ".."). These entries
+         * are not mandatory according to Standard ECMA-107 and HelenOS VFS does
+         * not use them anyway, so this is rather a sign of our good will.
+         */
+        rc = fat_block_get(&b, bs, childp, 0, BLOCK_FLAGS_NONE);
+        if (rc != EOK) {
                 /*
-                 * If possible, create the Sub-directory Identifier Entry and
-                 * the Sub-directory Parent Pointer Entry (i.e. "." and "..").
-                 * These entries are not mandatory according to Standard
-                 * ECMA-107 and HelenOS VFS does not use them anyway, so this is
-                 * rather a sign of our good will.
+                 * Rather than returning an error, simply skip the creation of
+                 * these two entries.
                  */
-                rc = fat_block_get(&b, bs, childp, 0, BLOCK_FLAGS_NONE);
-                if (rc != EOK) {
-                        /*
-                         * Rather than returning an error, simply skip the
-                         * creation of these two entries.
-                         */
-                        goto skip_dots;
-                }
-                d = (fat_dentry_t *)b->data;
-                if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
-                    str_cmp(d->name, FAT_NAME_DOT) == 0) {
-                        memset(d, 0, sizeof(fat_dentry_t));
-                        str_cpy(d->name, 8, FAT_NAME_DOT);
-                        str_cpy(d->ext, 3, FAT_EXT_PAD);
-                        d->attr = FAT_ATTR_SUBDIR;
-                        d->firstc = host2uint16_t_le(childp->firstc);
-                        /* TODO: initialize also the date/time members. */
-                }
-                d++;
-                if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
-                    str_cmp(d->name, FAT_NAME_DOT_DOT) == 0) {
-                        memset(d, 0, sizeof(fat_dentry_t));
-                        str_cpy(d->name, 8, FAT_NAME_DOT_DOT);
-                        str_cpy(d->ext, 3, FAT_EXT_PAD);
-                        d->attr = FAT_ATTR_SUBDIR;
-                        d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
-                            host2uint16_t_le(FAT_CLST_RES0) :
-                            host2uint16_t_le(parentp->firstc);
-                        /* TODO: initialize also the date/time members. */
-                }
-                b->dirty = true;                /* need to sync block */
-                /*
-                 * Ignore the return value as we would have fallen through on error
-                 * anyway.
-                 */
-                (void) block_put(b);
-        }
+                goto skip_dots;
+        }
+        d = (fat_dentry_t *)b->data;
+        if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
+            str_cmp(d->name, FAT_NAME_DOT) == 0) {
+                memset(d, 0, sizeof(fat_dentry_t));
+                str_cpy(d->name, 8, FAT_NAME_DOT);
+                str_cpy(d->ext, 3, FAT_EXT_PAD);
+                d->attr = FAT_ATTR_SUBDIR;
+                d->firstc = host2uint16_t_le(childp->firstc);
+                /* TODO: initialize also the date/time members. */
+        }
+        d++;
+        if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
+            str_cmp(d->name, FAT_NAME_DOT_DOT) == 0) {
+                memset(d, 0, sizeof(fat_dentry_t));
+                str_cpy(d->name, 8, FAT_NAME_DOT_DOT);
+                str_cpy(d->ext, 3, FAT_EXT_PAD);
+                d->attr = FAT_ATTR_SUBDIR;
+                d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
+                    host2uint16_t_le(FAT_CLST_RES0) :
+                    host2uint16_t_le(parentp->firstc);
+                /* TODO: initialize also the date/time members. */
+        }
+        b->dirty = true;                /* need to sync block */
+        /*
+         * Ignore the return value as we would have fallen through on error
+         * anyway.
+         */
+        (void) block_put(b);
 skip_dots: