update superBlockUsedBlocks for all xxxclone

Thomas-Tsai · Aug 30, 2023 · 8f93125 · 8f93125
1 parent c905de5
commit 8f93125
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ src/partclone.xfs
 src/partclone.minix
 src/partclone.f2fs
 src/partclone.nilfs2
+src/partclone.imgfuse
 src/version.h
 stamp-h1
 *.m4

diff --git a/src/apfsclone.c b/src/apfsclone.c
@@ -309,6 +309,7 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = nxsb.nx_block_size;
     fs_info->totalblock  = nxsb.nx_block_count;
     fs_info->usedblocks  = fs_info->totalblock-free_blocks;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = fs_info->totalblock*fs_info->block_size;
     fs_close();
 }

diff --git a/src/btrfsclone.c b/src/btrfsclone.c
@@ -433,10 +433,12 @@ void read_super_blocks(char* device, file_system_info* fs_info)
 
     fs_info->block_size  = btrfs_super_nodesize(root->fs_info->super_copy);
     fs_info->usedblocks  = btrfs_super_bytes_used(root->fs_info->super_copy) / fs_info->block_size;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = btrfs_super_total_bytes(root->fs_info->super_copy);
     fs_info->totalblock  = fs_info->device_size / fs_info->block_size;
     log_mesg(0, 0, 0, fs_opt.debug, "block_size = %i\n", fs_info->block_size);
     log_mesg(0, 0, 0, fs_opt.debug, "usedblock = %lli\n", fs_info->usedblocks);
+    log_mesg(0, 0, 0, fs_opt.debug, "superBlockUsedBlocks = %lli\n", fs_info->superBlockUsedBlocks);
     log_mesg(0, 0, 0, fs_opt.debug, "device_size = %llu\n", fs_info->device_size);
     log_mesg(0, 0, 0, fs_opt.debug, "totalblock = %lli\n", fs_info->totalblock);
 

diff --git a/src/ddclone.c b/src/ddclone.c
@@ -33,5 +33,6 @@ void read_super_blocks(char* device, file_system_info* fs_info)
 	fs_info->device_size = get_partition_size(&src);
 	fs_info->totalblock  = fs_info->device_size / PART_SECTOR_SIZE;
 	fs_info->usedblocks  = fs_info->device_size / PART_SECTOR_SIZE;
+        fs_info->superBlockUsedBlocks = fs_info->usedblocks;
 	close(src);
 }
diff --git a/src/exfatclone.c b/src/exfatclone.c
@@ -87,6 +87,7 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = EXFAT_SECTOR_SIZE(*sb);
     fs_info->totalblock  = le64_to_cpu(sb->sector_count);
     fs_info->usedblocks  = le64_to_cpu(sb->sector_count) - free_sectors;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = fs_info->totalblock * fs_info->block_size;
     fs_close();
 }

diff --git a/src/extfsclone.c b/src/extfsclone.c
@@ -238,10 +238,12 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->totalblock  = block_count();
     fs_info->usedblocks  = get_used_blocks();
     fs_info->device_size = fs_info->block_size * fs_info->totalblock;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
 
     log_mesg(1, 0, 0, fs_opt.debug, "%s: extfs block_size %i\n", __FILE__,    fs_info->block_size);
     log_mesg(1, 0, 0, fs_opt.debug, "%s: extfs total block %lli\n", __FILE__, fs_info->totalblock);
     log_mesg(1, 0, 0, fs_opt.debug, "%s: extfs used blocks %lli\n", __FILE__, fs_info->usedblocks);
+    log_mesg(1, 0, 0, fs_opt.debug, "%s: extfs superBlock used blocks %lli\n", __FILE__, fs_info->superBlockUsedBlocks);
     log_mesg(1, 0, 0, fs_opt.debug, "%s: extfs device size %lli\n", __FILE__, fs_info->device_size);
 
     fs_close();

diff --git a/src/f2fsclone.c b/src/f2fsclone.c
@@ -121,6 +121,7 @@ extern void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = F2FS_BLKSIZE;
     fs_info->totalblock  = sb->block_count;
     fs_info->usedblocks  = (sb->segment_count-cp->free_segment_count)*DEFAULT_BLOCKS_PER_SEGMENT;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = config.total_sectors*config.sector_size;
     fs_close();
 }

diff --git a/src/fatclone.c b/src/fatclone.c
@@ -385,10 +385,12 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = fat_sb.sector_size;
     fs_info->totalblock  = total_sector;
     fs_info->usedblocks  = bused;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = total_sector * fs_info->block_size;
     log_mesg(2, 0, 0, fs_opt.debug, "%s: Block Size:%i\n", __FILE__, fs_info->block_size);
     log_mesg(2, 0, 0, fs_opt.debug, "%s: Total Blocks:%llu\n", __FILE__, fs_info->totalblock);
     log_mesg(2, 0, 0, fs_opt.debug, "%s: Used Blocks:%llu\n", __FILE__, fs_info->usedblocks);
+    log_mesg(2, 0, 0, fs_opt.debug, "%s: superBlockUsedBlocks:%llu\n", __FILE__, fs_info->superBlockUsedBlocks);
     log_mesg(2, 0, 0, fs_opt.debug, "%s: Device Size:%llu\n", __FILE__, fs_info->device_size);
 
     fs_close();

diff --git a/src/hfsplusclone.c b/src/hfsplusclone.c
@@ -311,9 +311,11 @@ void read_super_blocks(char* device, file_system_info* fs_info)
         fs_info->usedblocks  = be32toh(sb.totalBlocks) - be32toh(sb.freeBlocks);
         fs_info->device_size = fs_info->block_size * fs_info->totalblock;
     }
-    log_mesg(2, 0, 0, 2, "%s: blockSize:%i\n", __FILE__, fs_info->block_size);
-    log_mesg(2, 0, 0, 2, "%s: totalBlocks:%i\n", __FILE__, fs_info->totalblock);
-    log_mesg(2, 0, 0, 2, "%s: freeBlocks:%i\n", __FILE__, fs_info->totalblock - fs_info->usedblocks);
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
+    log_mesg(2, 0, 0, 2, "%s: blockSize:%lli\n", __FILE__, fs_info->block_size);
+    log_mesg(2, 0, 0, 2, "%s: totalBlocks:%lli\n", __FILE__, fs_info->totalblock);
+    log_mesg(2, 0, 0, 2, "%s: freeBlocks:%lli\n", __FILE__, fs_info->totalblock - fs_info->usedblocks);
+    log_mesg(2, 0, 0, 2, "%s: superBlockUsedBlocks:%lli\n", __FILE__, fs_info->superBlockUsedBlocks);
     print_fork_data(&sb.allocationFile);
     print_fork_data(&sb.extentsFile);
     print_fork_data(&sb.catalogFile);

diff --git a/src/jfsclone.c b/src/jfsclone.c
@@ -285,6 +285,7 @@ void read_super_blocks(char* device, file_system_info* fs_info) {
     fs_info->block_size  = sb.s_bsize;
     fs_info->totalblock  = total_blocks;
     fs_info->usedblocks  = used_blocks;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = total_blocks * sb.s_bsize;
     fs_close();
 }

diff --git a/src/main.c b/src/main.c
@@ -205,7 +205,6 @@ int main(int argc, char **argv) {
 
 		/// get Super Block information from partition
 		read_super_blocks(source, &fs_info);
-		fs_info.superBlockUsedBlocks = fs_info.usedblocks;
 
 		if (img_opt.checksum_mode != CSM_NONE && img_opt.blocks_per_checksum == 0) {
 
@@ -309,7 +308,6 @@ int main(int argc, char **argv) {
 
 		/// get Super Block information from partition
 		read_super_blocks(source, &fs_info);
-		fs_info.superBlockUsedBlocks = fs_info.usedblocks;
 
 		check_mem_size(fs_info, img_opt, opt);
 
@@ -341,7 +339,6 @@ int main(int argc, char **argv) {
 		if (dfr != 0){
 		    fs_info.device_size = get_partition_size(&dfr);
 		    read_super_blocks(source, &fs_info);
-		    fs_info.superBlockUsedBlocks = fs_info.usedblocks;
 		}else{
 		    if (target_stdout) {
 			log_mesg(0, 1, 1, debug, "%s, %i, stdout is not supported\n", __func__, __LINE__);
@@ -355,7 +352,6 @@ int main(int argc, char **argv) {
 			fs_info.device_size = get_free_space(target);
 		    }
 		    read_super_blocks(target, &fs_info);
-		    fs_info.superBlockUsedBlocks = fs_info.usedblocks;
 		}
 		img_opt.checksum_mode = opt.checksum_mode;
 		img_opt.checksum_size = get_checksum_size(opt.checksum_mode, opt.debug);

diff --git a/src/minixclone.c b/src/minixclone.c
@@ -209,6 +209,7 @@ void read_super_blocks(char* device, file_system_info* fs_info) {
     fs_info->block_size  = get_block_size();
     fs_info->totalblock  = get_nzones();
     fs_info->usedblocks  = count_used_block();
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = fs_info->totalblock * fs_info->block_size;
     fs_close();
 }

diff --git a/src/nilfsclone.c b/src/nilfsclone.c
@@ -180,6 +180,7 @@ extern void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = nilfs_get_block_size(nilfs);
     fs_info->totalblock  = sbp->s_dev_size / fs_info->block_size;
     fs_info->usedblocks  = fs_info->totalblock - sbp->s_free_blocks_count;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = sbp->s_dev_size;
     fs_close();
 }

diff --git a/src/reiser4clone.c b/src/reiser4clone.c
@@ -143,6 +143,7 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = get_ms_blksize(SUPER(fs->master));
     fs_info->totalblock  = reiser4_format_get_len(fs->format);
     fs_info->usedblocks  = reiser4_format_get_len(fs->format) - free_blocks;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = fs_info->block_size * fs_info->totalblock;
     fs_close();
 }

diff --git a/src/reiserfsclone.c b/src/reiserfsclone.c
@@ -111,6 +111,7 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = fs->super->s_v1.sb_block_size;
     fs_info->totalblock  = fs->super->s_v1.sb_block_count;
     fs_info->usedblocks  = fs->super->s_v1.sb_block_count - fs->super->s_v1.sb_free_blocks;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = fs_info->block_size * fs_info->totalblock;
     fs_close();
 }

diff --git a/src/ufsclone.c b/src/ufsclone.c
@@ -182,6 +182,7 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     strncpy(fs_info->fs, ufs_MAGIC, FS_MAGIC_SIZE);
     fs_info->block_size = afs.fs_fsize;
     fs_info->usedblocks = get_used_block();
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     switch (disk.d_ufs) {
         case 2:
             fs_info->totalblock  = afs.fs_size;

diff --git a/src/version.h b/src/version.h
@@ -3,5 +3,5 @@
  * WHETHER THEY ARE BUILT BY OTHERS OR DURING DEVELOPMENT OR FOR THE
  * OFFICIAL PARTCLONE RELEASES.
  */
-#define git_version  "897b3a368f91c99e13a5dcf3f26ba8bc83f8999a"
+#define git_version  "c905de58e162d559138eeabc5c9152a41bfa2f9e"
 
diff --git a/src/vmfs5clone.c b/src/vmfs5clone.c
@@ -433,12 +433,14 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = vmfs_fs_get_blocksize(fs);
     fs_info->totalblock  = total;
     fs_info->usedblocks  = alloc;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = vmfs_fs_get_blocksize(fs) * total;
     total_block = total+100;
     log_mesg(3, 0, 0, fs_opt.debug, "block_size %u\n", fs_info->block_size);
     log_mesg(3, 0, 0, fs_opt.debug, "totalblock %llu\n", fs_info->totalblock);
     log_mesg(3, 0, 0, fs_opt.debug, "device_size %llu\n", fs_info->device_size);
     log_mesg(3, 0, 0, fs_opt.debug, "usedblocks %llu\n", fs_info->usedblocks);
+    log_mesg(3, 0, 0, fs_opt.debug, "superBlockUsedBlocks %llu\n", fs_info->superBlockUsedBlocks);
 
     fs_close();
 }

diff --git a/src/vmfsclone.c b/src/vmfsclone.c
@@ -139,6 +139,7 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = vmfs_fs_get_blocksize(fs);
     fs_info->totalblock  = total;
     fs_info->usedblocks  = alloc;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = vmfs_fs_get_blocksize(fs) * total;
     fs_close();
 }

diff --git a/src/xfsclone.c b/src/xfsclone.c
@@ -350,11 +350,13 @@ void read_super_blocks(char* device, file_system_info* fs_info)
     fs_info->block_size  = mp->m_sb.sb_blocksize;
     fs_info->totalblock  = mp->m_sb.sb_dblocks;
     fs_info->usedblocks  = mp->m_sb.sb_dblocks - mp->m_sb.sb_fdblocks;
+    fs_info->superBlockUsedBlocks = fs_info->usedblocks;
     fs_info->device_size = fs_info->totalblock * fs_info->block_size;
     log_mesg(1, 0, 0, fs_opt.debug, "%s: blcos size= %i\n", __FILE__, mp->m_sb.sb_blocksize);
     log_mesg(1, 0, 0, fs_opt.debug, "%s: total b= %lli\n", __FILE__, mp->m_sb.sb_dblocks);
     log_mesg(1, 0, 0, fs_opt.debug, "%s: free block= %lli\n", __FILE__, mp->m_sb.sb_fdblocks);
     log_mesg(1, 0, 0, fs_opt.debug, "%s: used block= %lli\n", __FILE__, (mp->m_sb.sb_dblocks - mp->m_sb.sb_fdblocks));
+    log_mesg(1, 0, 0, fs_opt.debug, "%s: superBlockUsedBlocks= %lli\n", __FILE__, fs_info->superBlockUsedBlocks);
     log_mesg(1, 0, 0, fs_opt.debug, "%s: device size= %lli\n", __FILE__, (mp->m_sb.sb_blocksize*mp->m_sb.sb_dblocks));
     fs_close();