Changeset 18b6a88 in mainline for uspace/srv/fs

Timestamp:

2018-04-15T09:35:04Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

Location:

uspace/srv/fs

Files:

• exfat/exfat_directory.c (modified) (1 diff)
• exfat/exfat_fat.c (modified) (3 diffs)
• exfat/exfat_idx.c (modified) (6 diffs)
• exfat/exfat_ops.c (modified) (8 diffs)
• fat/fat_fat.c (modified) (4 diffs)
• fat/fat_idx.c (modified) (6 diffs)
• fat/fat_ops.c (modified) (3 diffs)
• locfs/locfs_ops.c (modified) (3 diffs)
• mfs/mfs_dentry.c (modified) (1 diff)
• mfs/mfs_ops.c (modified) (5 diffs)
• tmpfs/tmpfs_ops.c (modified) (1 diff)

uspace/srv/fs/exfat/exfat_directory.c

@@ -455 +455 @@
                 if (i == df.file.count - 2) {
                         chars = ds.stream.name_size -
-                            EXFAT_NAME_PART_LEN*(df.file.count - 2);
+                            EXFAT_NAME_PART_LEN * (df.file.count - 2);
                 }
 

uspace/srv/fs/exfat/exfat_fat.c

@@ -142 +142 @@
                          */
                         return block_get(block, nodep->idx->service_id, DATA_FS(bs) +
-                        (nodep->lastc_cached_value-EXFAT_CLST_FIRST)*SPC(bs) +
+                            (nodep->lastc_cached_value - EXFAT_CLST_FIRST) * SPC(bs) +
                             (bn % SPC(bs)), flags);
                 }
@@ -201 +201 @@
         if (!fragmented) {
                 rc = block_get(block, service_id, DATA_FS(bs) +
-                    (fcl - EXFAT_CLST_FIRST)*SPC(bs) + bn, flags);
+                    (fcl - EXFAT_CLST_FIRST) * SPC(bs) + bn, flags);
         } else {
                 max_clusters = bn / SPC(bs);
@@ -514 +514 @@
         block_t *b;
         errno_t rc;
-        blocks = ROUND_UP(nodep->size, BPS(bs))/BPS(bs);
+        blocks = ROUND_UP(nodep->size, BPS(bs)) / BPS(bs);
         count = BPS(bs);
 

uspace/srv/fs/exfat/exfat_idx.c

@@ -119 +119 @@
 static inline size_t pos_key_hash(void *key)
 {
-        pos_key_t *pos = (pos_key_t*)key;
+        pos_key_t *pos = (pos_key_t *)key;
 
         size_t hash = 0;
@@ -141 +141 @@
 static bool pos_key_equal(void *key, const ht_link_t *item)
 {
-        pos_key_t *pos = (pos_key_t*)key;
+        pos_key_t *pos = (pos_key_t *)key;
         exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uph_link);
 
-        return pos->service_id == fidx->service_id
-                && pos->pdi == fidx->pdi
-                && pos->pfc == fidx->pfc;
+        return pos->service_id == fidx->service_id &&
+            pos->pdi == fidx->pdi &&
+            pos->pfc == fidx->pfc;
 }
 
@@ -170 +170 @@
 static size_t idx_key_hash(void *key_arg)
 {
-        idx_key_t *key = (idx_key_t*)key_arg;
+        idx_key_t *key = (idx_key_t *)key_arg;
         return hash_combine(key->service_id, key->index);
 }
@@ -183 +183 @@
 {
         exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uih_link);
-        idx_key_t *key = (idx_key_t*)key_arg;
+        idx_key_t *key = (idx_key_t *)key_arg;
 
         return key->index == fidx->index && key->service_id == fidx->service_id;
@@ -509 +509 @@
 static bool rm_pos_service_id(ht_link_t *item, void *arg)
 {
-        service_id_t service_id = *(service_id_t*)arg;
+        service_id_t service_id = *(service_id_t *)arg;
         exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uph_link);
 
@@ -521 +521 @@
 static bool rm_idx_service_id(ht_link_t *item, void *arg)
 {
-        service_id_t service_id = *(service_id_t*)arg;
+        service_id_t service_id = *(service_id_t *)arg;
         exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uih_link);
 

uspace/srv/fs/exfat/exfat_ops.c

@@ -248 +248 @@
                 fn = FS_NODE(nodep);
         } else {
-skip_cache:
+        skip_cache:
                 /* Try to allocate a new node structure. */
                 fibril_mutex_unlock(&ffn_mutex);
@@ -533 +533 @@
                             (BPS(di.bs) / sizeof(exfat_dentry_t));
                         exfat_idx_t *idx = exfat_idx_get_by_pos(service_id,
-                                parentp->firstc, di.bnum * DPS(di.bs) + o);
+                            parentp->firstc, di.bnum * DPS(di.bs) + o);
                         if (!idx) {
                                 /*
@@ -706 +706 @@
                 if (nodep->fragmented)
                         rc = exfat_free_clusters(bs, nodep->idx->service_id,
-                                nodep->firstc);
+                            nodep->firstc);
                 else
                         rc = exfat_bitmap_free_clusters(bs, nodep,
@@ -805 +805 @@
 
         exfat_directory_t di;
-        rc = exfat_directory_open(parentp,&di);
+        rc = exfat_directory_open(parentp, &di);
         if (rc != EOK)
                 goto error;
@@ -1062 +1062 @@
         rc = exfat_node_get_new_by_pos(&rootp, service_id, EXFAT_ROOT_PAR,
             EXFAT_ROOT_POS);
-        if (rc!=EOK) {
+        if (rc != EOK) {
                 (void) block_cache_fini(service_id);
                 block_fini(service_id);
@@ -1183 +1183 @@
                         block_fini(service_id);
                         exfat_idx_fini_by_service_id(service_id);
-                    return ENOTSUP;
+                        return ENOTSUP;
                 }
         }
@@ -1409 +1409 @@
                 (void) exfat_directory_close(&di);
 
-err:
+        err:
                 (void) exfat_node_put(fn);
                 async_answer_0(chandle, rc);
                 return rc;
 
-miss:
+        miss:
                 rc = exfat_directory_close(&di);
                 if (rc != EOK)
@@ -1423 +1423 @@
                 return rc != EOK ? rc : ENOENT;
 
-hit:
+        hit:
                 pos = di.pos;
                 rc = exfat_directory_close(&di);

uspace/srv/fs/fat/fat_fat.c

@@ -249 +249 @@
         for (o = nodep->size; o < pos && o < boundary;
             o = ALIGN_DOWN(o + BPS(bs), BPS(bs))) {
-                int flags = (o % BPS(bs) == 0) ?
+                int flags = (o % BPS(bs) == 0) ?
                     BLOCK_FLAGS_NOREAD : BLOCK_FLAGS_NONE;
                 rc = fat_block_get(&b, bs, nodep, o / BPS(bs), flags);
@@ -324 +324 @@
                         * first byte of next sector
                         */
-                        byte2 = ((uint8_t*) b1->data)[0];
+                        byte2 = ((uint8_t *) b1->data)[0];
 
                         rc = block_put(b1);
@@ -469 +469 @@
                 return rc;
 
-        byte1 = ((uint8_t*) b->data)[offset % BPS(bs)];
+        byte1 = ((uint8_t *) b->data)[offset % BPS(bs)];
         bool border = false;
         /* This cluster access spans a sector boundary. */
@@ -495 +495 @@
                 }
         } else
-                byte2 = ((uint8_t*) b->data)[(offset % BPS(bs)) + 1];
+                byte2 = ((uint8_t *) b->data)[(offset % BPS(bs)) + 1];
 
         if (IS_ODD(clst)) {

uspace/srv/fs/fat/fat_idx.c

@@ -119 +119 @@
 static inline size_t pos_key_hash(void *key)
 {
-        pos_key_t *pos = (pos_key_t*)key;
+        pos_key_t *pos = (pos_key_t *)key;
 
         size_t hash = 0;
@@ -141 +141 @@
 static bool pos_key_equal(void *key, const ht_link_t *item)
 {
-        pos_key_t *pos = (pos_key_t*)key;
+        pos_key_t *pos = (pos_key_t *)key;
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link);
 
-        return pos->service_id == fidx->service_id
-                && pos->pdi == fidx->pdi
-                && pos->pfc == fidx->pfc;
+        return pos->service_id == fidx->service_id &&
+            pos->pdi == fidx->pdi &&
+            pos->pfc == fidx->pfc;
 }
 
@@ -170 +170 @@
 static size_t idx_key_hash(void *key_arg)
 {
-        idx_key_t *key = (idx_key_t*)key_arg;
+        idx_key_t *key = (idx_key_t *)key_arg;
         return hash_combine(key->service_id, key->index);
 }
@@ -183 +183 @@
 {
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link);
-        idx_key_t *key = (idx_key_t*)key_arg;
+        idx_key_t *key = (idx_key_t *)key_arg;
 
         return key->index == fidx->index && key->service_id == fidx->service_id;
@@ -508 +508 @@
 static bool rm_pos_service_id(ht_link_t *item, void *arg)
 {
-        service_id_t service_id = *(service_id_t*)arg;
+        service_id_t service_id = *(service_id_t *)arg;
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link);
 
@@ -520 +520 @@
 static bool rm_idx_service_id(ht_link_t *item, void *arg)
 {
-        service_id_t service_id = *(service_id_t*)arg;
+        service_id_t service_id = *(service_id_t *)arg;
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link);
 

uspace/srv/fs/fat/fat_ops.c

@@ -241 +241 @@
                 fn = FS_NODE(nodep);
         } else {
-skip_cache:
+        skip_cache:
                 /* Try to allocate a new node structure. */
                 fibril_mutex_unlock(&ffn_mutex);
@@ -1289 +1289 @@
                         goto miss;
 
-err:
+        err:
                 (void) fat_node_put(fn);
                 async_answer_0(chandle, rc);
                 return rc;
 
-miss:
+        miss:
                 rc = fat_directory_close(&di);
                 if (rc != EOK)
@@ -1303 +1303 @@
                 return rc != EOK ? rc : ENOENT;
 
-hit:
+        hit:
                 pos = di.pos;
                 rc = fat_directory_close(&di);

uspace/srv/fs/locfs/locfs_ops.c

@@ -73 +73 @@
 static size_t services_key_hash(void *key)
 {
-        return *(service_id_t*)key;
+        return *(service_id_t *)key;
 }
 
@@ -85 +85 @@
 {
         service_t *dev = hash_table_get_inst(item, service_t, link);
-        return (dev->service_id == *(service_id_t*)key);
+        return (dev->service_id == *(service_id_t *)key);
 }
 
@@ -234 +234 @@
                 fibril_mutex_lock(&services_mutex);
                 ht_link_t *lnk;
-restart:
+        restart:
                 lnk = hash_table_find(&services, &node->service_id);
                 if (lnk == NULL) {

uspace/srv/fs/mfs/mfs_dentry.c

@@ -171 +171 @@
         /* Search the directory entry to be removed */
         unsigned i;
-        for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {
+        for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
                 r = mfs_read_dentry(mnode, &d_info, i);
                 if (r != EOK)

uspace/srv/fs/mfs/mfs_ops.c

@@ -103 +103 @@
 open_nodes_key_hash(void *key)
 {
-        node_key_t *node_key = (node_key_t*)key;
+        node_key_t *node_key = (node_key_t *)key;
         return hash_combine(node_key->service_id, node_key->index);
 }
@@ -117 +117 @@
 open_nodes_key_equal(void *key, const ht_link_t *item)
 {
-        node_key_t *node_key = (node_key_t*)key;
+        node_key_t *node_key = (node_key_t *)key;
         struct mfs_node *mnode = hash_table_get_inst(item, struct mfs_node, link);
 
-        return node_key->service_id == mnode->instance->service_id
-                && node_key->index == mnode->ino_i->index;
+        return node_key->service_id == mnode->instance->service_id &&
+            node_key->index == mnode->ino_i->index;
 }
 
@@ -361 +361 @@
         if (sbi)
                 free(sbi);
-        if(instance)
+        if (instance)
                 free(instance);
         return rc;
@@ -871 +871 @@
                 async_answer_0(chandle, rc != EOK ? rc : ENOENT);
                 return rc;
-found:
+        found:
                 async_data_read_finalize(chandle, d_info.d_name,
                     str_size(d_info.d_name) + 1);
@@ -1102 +1102 @@
 static bool
 check_magic_number(uint16_t magic, bool *native,
-                mfs_version_t *version, bool *longfilenames)
+    mfs_version_t *version, bool *longfilenames)
 {
         bool rc = true;

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -238 +238 @@
 static bool rm_service_id_nodes(ht_link_t *item, void *arg)
 {
-        service_id_t sid = *(service_id_t*)arg;
+        service_id_t sid = *(service_id_t *)arg;
         tmpfs_node_t *node = hash_table_get_inst(item, tmpfs_node_t, nh_link);