From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Thu, 23 Jun 2022 02:17:14 +0000 (-0400)
Subject: Fix bdev_logical_block_size()
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b4afc1fa26671f946597e71a580abee42ab634b3;p=bcachefs-tools-debian

Fix bdev_logical_block_size()

We were returning sectors instead of bytes.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
---

diff --git a/linux/blkdev.c b/linux/blkdev.c
index b545e95..bd9dc9c 100644
--- a/linux/blkdev.c
+++ b/linux/blkdev.c
@@ -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)