Changes in / [9256d093:1c8bfe8] in mainline

Location:

uspace/lib

Files:

• gpt/libgpt.c (modified) (6 diffs)
• mbr/libmbr.h (modified) (1 diff)

uspace/lib/gpt/libgpt.c

@@ -57 +57 @@
 static long long nearest_larger_int(double a);
 static uint8_t get_byte(const char *);
-static int check_overlap(gpt_part_t * p1, gpt_part_t * p2);
 
 /** Allocate memory for gpt label */
@@ -291 +290 @@
 
 /** Write GPT and partitions to device
- * Note: also writes the header.
  * @param label        label to write
  * @param dev_handle   device to write the data to
@@ -426 +424 @@
  * Note: for use with gpt_alloc_partition() only. You will get
  * duplicates with gpt_get_partition().
- * Note: does not call gpt_free_partition()!
  */
 int gpt_add_partition(gpt_label_t *label, gpt_part_t *partition)
@@ -435 +432 @@
         }
         
-        /*FIXME:
-         * Check dimensions and stuff! */
-        gpt_part_foreach(label, p) {
-                if (gpt_get_part_type(p) != GPT_PTE_UNUSED) {
-                        if (check_overlap(partition, p))
-                                return EINVAL;
-                }
-        }
-        
         memcpy(label->parts->part_array + label->parts->fill++,
                partition, sizeof(gpt_part_t));
-        
-        
         
         return EOK;
@@ -474 +460 @@
         label->parts->fill -= 1;
         
-        /* FIXME! HOPEFULLY FIXED.
+        /* FIXME!
          * We cannot reduce the array so simply. We may have some partitions
-         * there since we allow blank spots. */
-        gpt_part_t * p;
+         * there since we allow blank spots.*/
         if (label->parts->fill < (label->parts->arr_size / 2) - GPT_IGNORE_FILL_NUM) {
-                for (p = gpt_get_partition_at(label, label->parts->arr_size / 2); 
-                     p < label->parts->part_array + label->parts->arr_size; ++p) {
-                                if (gpt_get_part_type(p) != GPT_PTE_UNUSED)
-                                        return EOK;
-                }
-                
                 if (reduce_part_array(label->parts) == ENOMEM)
                         return ENOMEM;
@@ -733 +712 @@
 }
 
-static int check_overlap(gpt_part_t * p1, gpt_part_t * p2)
-{
-        if (gpt_get_start_lba(p1) < gpt_get_start_lba(p2) && gpt_get_end_lba(p1) <= gpt_get_start_lba(p2)) {
-                return 0;
-        } else if (gpt_get_start_lba(p1) > gpt_get_start_lba(p2) && gpt_get_end_lba(p2) <= gpt_get_start_lba(p1)) {
-                return 0;
-        }
-
-        return 1;
-}
-
-
+
+
+

uspace/lib/mbr/libmbr.h

@@ -204 +204 @@
 /* Read/Write/Set MBR partitions.
  * NOTE: Writing partitions writes the complete header as well. */
-extern int          mbr_read_partitions(mbr_label_t *);
+extern int mbr_read_partitions(mbr_label_t *);
 extern int          mbr_write_partitions(mbr_label_t *, service_id_t);
 extern mbr_part_t * mbr_alloc_partition(void);