Changeset f647b87 in mainline

Timestamp:

2025-04-20T14:32:32Z (4 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

afec52b4

Parents:

d3a23c9

Message:

srv/bd/hr: remove unused nblocks variable

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (1 diff)
• metadata/native.c (modified) (5 diffs)
• metadata/native.h (modified) (1 diff)
• raid0.c (modified) (1 diff)
• raid1.c (modified) (1 diff)
• raid5.c (modified) (1 diff)
• var.h (modified) (1 diff)

uspace/srv/bd/hr/hr.c

@@ -377 +377 @@
                 info.level = vol->level;
                 /* print usable number of blocks */
+                /* TODO: change to data_blkno */
                 info.nblocks = vol->data_blkno;
                 info.strip_size = vol->strip_size;

uspace/srv/bd/hr/metadata/native.c

@@ -122 +122 @@
         /* uuid_encode(&uuid, metadata->uuid); */
 
-        md->nblocks = vol->nblocks;
         md->data_blkno = vol->data_blkno;
         md->truncated_blkno = vol->truncated_blkno;
@@ -155 +154 @@
         assert(main_meta != NULL);
 
-        vol->nblocks = main_meta->nblocks;
         vol->data_blkno = main_meta->data_blkno;
         vol->truncated_blkno = main_meta->truncated_blkno;
@@ -210 +208 @@
         /* uuid_decode((uint8_t *)scratch_md.uuid, (uuid_t *)metadata->uuid); */
 
-        scratch_md.nblocks = host2uint64_t_le(metadata->nblocks);
         scratch_md.data_blkno = host2uint64_t_le(metadata->data_blkno);
         scratch_md.truncated_blkno = host2uint64_t_le(
@@ -245 +242 @@
         /* uuid_decode((uint8_t *)scratch_md.uuid, (uuid_t *)metadata->uuid); */
 
-        metadata->nblocks = uint64_t_le2host(scratch_md.nblocks);
         metadata->data_blkno = uint64_t_le2host(scratch_md.data_blkno);
         metadata->truncated_blkno = uint64_t_le2host(
@@ -464 +460 @@
         }
         printf("\n");
-        printf("\tnblocks: %" PRIu64 "\n", metadata->nblocks);
         printf("\tdata_blkno: %" PRIu64 "\n", metadata->data_blkno);
         printf("\ttruncated_blkno: %" PRIu64 "\n", metadata->truncated_blkno);

uspace/srv/bd/hr/metadata/native.h

@@ -55 +55 @@
         uint8_t         uuid[HR_NATIVE_UUID_LEN];
 
-        /* TODO: change to blkno */
-        uint64_t        nblocks;                /* all blocks */
         uint64_t        data_blkno;             /* usable blocks */
+        uint64_t        truncated_blkno;        /* size of smallest extent */
 
-        uint64_t        truncated_blkno;        /* usable blocks */
         uint64_t        data_offset;
+        uint64_t        counter;
 
-        uint64_t        counter;                /* XXX: yet unused */
         uint32_t        version;                /* XXX: yet unused */
         uint32_t        extent_no;
-
         uint32_t        index;                  /* index of extent in volume */
         uint32_t        level;
+
         uint32_t        layout;
         uint32_t        strip_size;

uspace/srv/bd/hr/raid0.c

@@ -123 +123 @@
 
         vol->truncated_blkno = truncated_blkno;
-        vol->nblocks = total_blkno;
         vol->data_offset = vol->meta_ops->get_data_offset();
 

uspace/srv/bd/hr/raid1.c

@@ -137 +137 @@
 
         vol->truncated_blkno = truncated_blkno;
-        vol->nblocks = truncated_blkno;
         vol->data_offset = vol->meta_ops->get_data_offset();
         vol->data_blkno = truncated_blkno - vol->meta_ops->get_size();

uspace/srv/bd/hr/raid5.c

@@ -138 +138 @@
 
         vol->truncated_blkno = truncated_blkno;
-        vol->nblocks = total_blkno;
         vol->data_offset = vol->meta_ops->get_data_offset();
 

uspace/srv/bd/hr/var.h

@@ -81 +81 @@
         size_t           extent_no;             /* number of extents */
         size_t           bsize;                 /* block size */
-        uint64_t         nblocks;               /* no. of all usable blocks */
         uint64_t         truncated_blkno;       /* blkno per extent */
         uint64_t         data_blkno;            /* no. of user usable blocks */