opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust size of volume with dev_offset 

The volume's size should be smaller on dev_offset
pull/48/head
Konstantin Germanov 2022-06-28 06:46:08 -04:00
parent d874c30200
commit 1980c1a3dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libntfs-3g/device.c
View File

@ -566,7 +566,7 @@ s64 ntfs_device_size_get(struct ntfs_device *dev, int block_size)
ntfs_log_debug("BLKGETSIZE64 nr bytes = %llu (0x%llx)\n", ntfs_log_debug("BLKGETSIZE64 nr bytes = %llu (0x%llx)\n",
(unsigned long long)size, (unsigned long long)size,
(unsigned long long)size); (unsigned long long)size);
return (s64)size / block_size; return (s64)(size - dev->dev_offset) / block_size;
} }
} }
#endif #endif
@ -576,7 +576,7 @@ s64 ntfs_device_size_get(struct ntfs_device *dev, int block_size)
if (dev->d_ops->ioctl(dev, BLKGETSIZE, &size) >= 0) { if (dev->d_ops->ioctl(dev, BLKGETSIZE, &size) >= 0) {
ntfs_log_debug("BLKGETSIZE nr 512 byte blocks = %lu (0x%lx)\n", ntfs_log_debug("BLKGETSIZE nr 512 byte blocks = %lu (0x%lx)\n",
size, size); size, size);
return (s64)size * 512 / block_size; return (s64)(size * 512 - dev->dev_offset) / block_size;
} }
} }
#endif #endif
@ -587,7 +587,7 @@ s64 ntfs_device_size_get(struct ntfs_device *dev, int block_size)
ntfs_log_debug("FDGETPRM nr 512 byte blocks = %lu (0x%lx)\n", ntfs_log_debug("FDGETPRM nr 512 byte blocks = %lu (0x%lx)\n",
(unsigned long)this_floppy.size, (unsigned long)this_floppy.size,
(unsigned long)this_floppy.size); (unsigned long)this_floppy.size);
return (s64)this_floppy.size * 512 / block_size; return (s64)(this_floppy.size * 512 - dev->dev_offset) / block_size;
} }
} }
#endif #endif
@ -600,7 +600,7 @@ s64 ntfs_device_size_get(struct ntfs_device *dev, int block_size)
ntfs_log_debug("DIOCGMEDIASIZE nr bytes = %llu (0x%llx)\n", ntfs_log_debug("DIOCGMEDIASIZE nr bytes = %llu (0x%llx)\n",
(unsigned long long)size, (unsigned long long)size,
(unsigned long long)size); (unsigned long long)size);
return (s64)size / block_size; return (s64)(size - dev->dev_offset) / block_size;
} }
} }
#endif #endif
@ -617,7 +617,7 @@ s64 ntfs_device_size_get(struct ntfs_device *dev, int block_size)
ntfs_log_debug("DKIOCGETBLOCKCOUNT nr blocks = %llu (0x%llx)\n", ntfs_log_debug("DKIOCGETBLOCKCOUNT nr blocks = %llu (0x%llx)\n",
(unsigned long long) blocks, (unsigned long long) blocks,
(unsigned long long) blocks); (unsigned long long) blocks);
return blocks * sector_size / block_size; return (blocks * sector_size - dev->dev_offset) / block_size;
} }
} }
#endif #endif