Changeset 9f4650c in mainline

Timestamp:

2013-07-26T18:31:47Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

c3cbbb2

Parents:

9256d093 (diff), 1a1a735 (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:

libgpt fixes

Location:

uspace

Files:

• app/hdisk/func_gpt.c (modified) (2 diffs)
• app/hdisk/hdisk.c (modified) (1 diff)
• lib/gpt/libgpt.c (modified) (7 diffs)
• lib/gpt/libgpt.h (modified) (2 diffs)
• lib/mbr/libmbr.c (modified) (1 diff)

uspace/app/hdisk/func_gpt.c

@@ -194 +194 @@
         
         char *name;
+        printf("Name the partition: ");
         rc = get_input_line(in, &name);
         if (rc != EOK) {
@@ -200 +201 @@
         }
         
+        printf("name: %s, len: %d\n", name, str_size(name));
         gpt_set_part_name(p, name, str_size(name));
         

uspace/app/hdisk/hdisk.c

@@ -199 +199 @@
                         case 'q':
                                 putchar('\n');
+                                free_label();
                                 goto end;
                         case 'r':

uspace/lib/gpt/libgpt.c

@@ -127 +127 @@
         rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
         if (rc != EOK)
-                return rc;
+                goto fail;
         
         rc = block_get_bsize(dev_handle, &b_size);
         if (rc != EOK)
-                return rc;
+                goto fini_fail;
         
         if (label->gpt == NULL) {
                 label->gpt = gpt_alloc_header(b_size);
-                if (label->gpt == NULL)
-                        return ENOMEM;
+                if (label->gpt == NULL) {
+                        rc = ENOMEM;
+                        goto fini_fail;
+                }
         }
         
@@ -144 +146 @@
                 rc = block_get_nblocks(dev_handle, &n_blocks);
                 if (rc != EOK)
-                        goto fail;
+                        goto free_fail;
 
                 rc = load_and_check_header(dev_handle, n_blocks - 1, b_size, label->gpt->header);
                 if (rc == EBADCHECKSUM || rc == EINVAL)
-                        goto fail;
+                        goto free_fail;
         }
         
@@ -155 +157 @@
         return EOK;
         
-fail:
-        block_fini(dev_handle);
+free_fail:
         gpt_free_gpt(label->gpt);
         label->gpt = NULL;
+fini_fail:
+        block_fini(dev_handle);
+fail:
         return rc;
 }
@@ -240 +244 @@
          *  - we don't need more bytes
          *  - the size of GPT partition entry can be different to 128 bytes */
+        /* comm_size is ignored */
         rc = block_init(EXCHANGE_SERIALIZE, label->device, sizeof(gpt_entry_t));
         if (rc != EOK)
@@ -247 +252 @@
         rc = block_get_bsize(label->device, &block_size);
         if (rc != EOK)
-                goto fail;
+                goto fini_fail;
 
         //size_t bufpos = 0;
@@ -266 +271 @@
 
                 if (rc != EOK)
-                        goto fail;
+                        goto fini_fail;
         }
 
@@ -274 +279 @@
          * on all of the partition entry array.
          */
-        uint32_t crc = compute_crc32((uint8_t *) label->parts->part_array, label->parts->fill * sizeof(gpt_entry_t));
+        uint32_t crc = compute_crc32((uint8_t *) label->parts->part_array, 
+                           label->parts->fill * sizeof(gpt_entry_t));
 
         if(uint32_t_le2host(label->gpt->header->pe_array_crc32) != crc)
         {
                 rc = EBADCHECKSUM;
-                goto fail;
-        }
-
+                goto fini_fail;
+        }
+        
+        block_fini(label->device);
         return EOK;
+        
+fini_fail:
+        block_fini(label->device);
         
 fail:

uspace/lib/gpt/libgpt.h

@@ -71 +71 @@
  */
 typedef struct {
-        uint8_t efi_signature[8];
+        uint8_t  efi_signature[8];
         uint32_t revision;
         uint32_t header_size;
@@ -80 +80 @@
         uint64_t first_usable_lba;
         uint64_t last_usable_lba;
-        uint8_t disk_guid[16];
+        uint8_t  disk_guid[16];
         uint64_t entry_lba;
         uint32_t fillries;

uspace/lib/mbr/libmbr.c

@@ -590 +590 @@
         list_foreach_safe(parts->list, cur_link, next) {
                 mbr_part_t *p = list_get_instance(cur_link, mbr_part_t, link);
+                list_remove(cur_link);
                 mbr_free_partition(p);
         }