Swapped BLKGETSIZE for BLKGETSIZE64

geky · geky · commit f448139bdcd9 · 2023-08-21T14:37:07.000-05:00
BLKGETSIZE64 seems to report the size in bytes, which is what we
actually want. BLKGETSIZE reported the size in "512-byte blocks", which
just complicates our final block_count calculation.
diff --git a/lfs_fuse_bd.c b/lfs_fuse_bd.c
@@ -41,12 +41,12 @@ int lfs_fuse_bd_create(struct lfs_config *cfg, const char *path) {
 
     // get size in sectors
     if (!cfg->block_count) {
-        long size;
-        int err = ioctl(fd, BLKGETSIZE, &size);
+        uint64_t size;
+        int err = ioctl(fd, BLKGETSIZE64, &size);
         if (err) {
             return -errno;
         }
-        cfg->block_count = size * 512 / cfg->block_size;
+        cfg->block_count = size / cfg->block_size;
     }
 
     // setup function pointers

Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,12 @@ int lfs_fuse_bd_create(struct lfs_config cfg, const char path) {`
`41`	`41`
`42`	`42`	`// get size in sectors`
`43`	`43`	`if (!cfg->block_count) {`
`44`		`- long size;`
`45`		`- int err = ioctl(fd, BLKGETSIZE, &size);`
	`44`	`+ uint64_t size;`
	`45`	`+ int err = ioctl(fd, BLKGETSIZE64, &size);`
`46`	`46`	`if (err) {`
`47`	`47`	`return -errno;`
`48`	`48`	`}`
`49`		`- cfg->block_count = size * 512 / cfg->block_size;`
	`49`	`+ cfg->block_count = size / cfg->block_size;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// setup function pointers`