block: Topology ioctls

Not all users of the topology information want to use libblkid.  Provide
the topology information through bdev ioctls.

Also clarify sector size comments for existing BLK ioctls.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 15 insertions, 2 deletions

diff --git a/block/ioctl.c b/block/ioctl.c
index d3e6b5827a3..1f4d1de12b0 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -138,6 +138,11 @@ static int put_int(unsigned long arg, int val)
         return put_user(val, (int __user *)arg);
 }
 
+static int put_uint(unsigned long arg, unsigned int val)
+{
+        return put_user(val, (unsigned int __user *)arg);
+}
+
 static int put_long(unsigned long arg, long val)
 {
         return put_user(val, (long __user *)arg);
@@ -263,10 +268,18 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                 return put_long(arg, (bdi->ra_pages * PAGE_CACHE_SIZE) / 512);
         case BLKROGET:
                 return put_int(arg, bdev_read_only(bdev) != 0);
-        case BLKBSZGET: /* get the logical block size (cf. BLKSSZGET) */
+        case BLKBSZGET: /* get block device soft block size (cf. BLKSSZGET) */
                 return put_int(arg, block_size(bdev));
-        case BLKSSZGET: /* get block device hardware sector size */
+        case BLKSSZGET: /* get block device logical block size */
                 return put_int(arg, bdev_logical_block_size(bdev));
+        case BLKPBSZGET: /* get block device physical block size */
+                return put_uint(arg, bdev_physical_block_size(bdev));
+        case BLKIOMIN:
+                return put_uint(arg, bdev_io_min(bdev));
+        case BLKIOOPT:
+                return put_uint(arg, bdev_io_opt(bdev));
+        case BLKALIGNOFF:
+                return put_int(arg, bdev_alignment_offset(bdev));
         case BLKSECTGET:
                 return put_ushort(arg, queue_max_sectors(bdev_get_queue(bdev)));
         case BLKRASET: