Fix partitions bigger than 2TB

Partitions which are bigger than 2TB doesn't fit unsigned long,
change it ot unsigned long long.

Signed-off-by: Dinar Valeev <dvaleev@suse.com>
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>

diff --git a/include/partition.h b/include/partition.h
index 23c99bae224d9b4cdd3ac27695a7f2ca817b596b..c9c4d0bd584b6741d4bc5a20b6b1f48117872e0e 100644 (file)
--- a/include/partition.h
+++ b/include/partition.h
@@ -37,8 +37,8 @@ struct partition_t {
        int                     part_number;
        char                    part_type[MAX_PART_NAME];
         char                    part_name[MAX_PART_NAME];
        int                     part_number;
        char                    part_type[MAX_PART_NAME];
         char                    part_name[MAX_PART_NAME];

-       unsigned long           part_start; /* In blocks */
-       unsigned long           part_size; /* In blocks */
+       unsigned long long      part_start; /* In blocks */
+       unsigned long long      part_size; /* In blocks */

        unsigned short          blocksize;
        int                     sys_ind; /* fs type */
 };
        unsigned short          blocksize;
        int                     sys_ind; /* fs type */
 };

diff --git a/second/file.c b/second/file.c
index 02b187231716e318964dc77681637d000ad2a35a..8412075689e08efa77a6da97b0bbb61490059231 100644 (file)
--- a/second/file.c
+++ b/second/file.c
@@ -590,7 +590,7 @@ file_block_open(    struct boot_file_t*     file,
          prom_printf("no partitions found.\n");
 #endif
      for (p = parts; p && !found; p=p->next) {
          prom_printf("no partitions found.\n");
 #endif
      for (p = parts; p && !found; p=p->next) {

-         DEBUG_F("number: %02d, start: 0x%08lx, length: 0x%08lx\n",
+         DEBUG_F("number: %02d, start: 0x%08Lx, length: 0x%08Lx\n",

                  p->part_number, p->part_start, p->part_size );
          if (partition == -1) {
               file->fs = fs_open( file, p, fspec );
                  p->part_number, p->part_start, p->part_size );
          if (partition == -1) {
               file->fs = fs_open( file, p, fspec );

diff --git a/second/fs_ext2.c b/second/fs_ext2.c
index 41a3c79cce2096ac513e9135ccb677b072a67f4f..5d5a5c78d7636fec310c92f40b31c1ed4c244a01 100644 (file)
--- a/second/fs_ext2.c
+++ b/second/fs_ext2.c
@@ -164,8 +164,8 @@ ext2_open(  struct boot_file_t*     file,
       */
      doff = dend = 0;
      if (part) {
       */
      doff = dend = 0;
      if (part) {

-         doff = (unsigned long long)(part->part_start) * part->blocksize;
-         dend = doff + (unsigned long long)part->part_size * part->blocksize;
+         doff = part->part_start * part->blocksize;
+         dend = doff + part->part_size * part->blocksize;

      }
      cur_file = file;
 
      }
      cur_file = file;
 

diff --git a/second/partition.c b/second/partition.c
index 7facbc46b3f68284576b781237b7c7c4a022ae2e..64b4725e78ee392b52ef680f504201fcee504b39 100644 (file)
--- a/second/partition.c
+++ b/second/partition.c
@@ -68,7 +68,7 @@ static unsigned char block_buffer[MAX_BLOCK_SIZE];
 
 static void
 add_new_partition(struct partition_t** list, int part_number, const char *part_type,
 
 static void
 add_new_partition(struct partition_t** list, int part_number, const char *part_type,

-                 const char *part_name, unsigned long part_start, unsigned long part_size,
+                 const char *part_name, unsigned long long part_start, unsigned long long part_size,

                  unsigned short part_blocksize, int sys_ind)
 {
      struct partition_t*       part;
                  unsigned short part_blocksize, int sys_ind)
 {
      struct partition_t*       part;


@@ -452,7 +452,7 @@ get_part_type(char *device, int partition)
          return '\0';
 
      for (p = parts; p && !found; p=p->next) {
          return '\0';
 
      for (p = parts; p && !found; p=p->next) {

-         DEBUG_F("number: %02d, start: 0x%08lx, length: 0x%08lx, type: %s, name: %s\n",
+         DEBUG_F("number: %02d, start: 0x%08Lx, length: 0x%08Lx, type: %s, name: %s\n",

                  p->part_number, p->part_start, p->part_size, p->part_type, p->part_name);
          if ((partition >= 0) && (partition == p->part_number)) {
               type = strdup(p->part_type);
                  p->part_number, p->part_start, p->part_size, p->part_type, p->part_name);
          if ((partition >= 0) && (partition == p->part_number)) {
               type = strdup(p->part_type);