]> git.sesse.net Git - bcachefs-tools-debian/commitdiff
Fix bdev_logical_block_size()
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 23 Jun 2022 02:17:14 +0000 (22:17 -0400)
committerKent Overstreet <kent.overstreet@gmail.com>
Thu, 23 Jun 2022 02:17:14 +0000 (22:17 -0400)
We were returning sectors instead of bytes.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
linux/blkdev.c

index b545e95da8772dc1e0c7d69e20e32144b90b6976..bd9dc9cc5e62bfe24cf313207e028028d9a17fc3 100644 (file)
@@ -128,12 +128,10 @@ unsigned bdev_logical_block_size(struct block_device *bdev)
        BUG_ON(ret);
 
        if (!S_ISBLK(statbuf.st_mode))
-               return statbuf.st_blksize >> 9;
+               return statbuf.st_blksize;
 
-       ret = ioctl(bdev->bd_fd, BLKPBSZGET, &blksize);
-       BUG_ON(ret);
-
-       return blksize >> 9;
+       xioctl(bdev->bd_fd, BLKPBSZGET, &blksize);
+       return blksize;
 }
 
 sector_t get_capacity(struct gendisk *disk)