diff options
-rw-r--r-- | block/compat_ioctl.c | 3 | ||||
-rw-r--r-- | block/ioctl.c | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 7b725020823c..7c668c8a6f95 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c | |||
@@ -719,6 +719,9 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) | |||
719 | case BLKSECTGET: | 719 | case BLKSECTGET: |
720 | return compat_put_ushort(arg, | 720 | return compat_put_ushort(arg, |
721 | queue_max_sectors(bdev_get_queue(bdev))); | 721 | queue_max_sectors(bdev_get_queue(bdev))); |
722 | case BLKROTATIONAL: | ||
723 | return compat_put_ushort(arg, | ||
724 | !blk_queue_nonrot(bdev_get_queue(bdev))); | ||
722 | case BLKRASET: /* compatible, but no compat_ptr (!) */ | 725 | case BLKRASET: /* compatible, but no compat_ptr (!) */ |
723 | case BLKFRASET: | 726 | case BLKFRASET: |
724 | if (!capable(CAP_SYS_ADMIN)) | 727 | if (!capable(CAP_SYS_ADMIN)) |
diff --git a/block/ioctl.c b/block/ioctl.c index ca939fc1030f..337d207ab14d 100644 --- a/block/ioctl.c +++ b/block/ioctl.c | |||
@@ -278,6 +278,8 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, | |||
278 | return put_uint(arg, bdev_discard_zeroes_data(bdev)); | 278 | return put_uint(arg, bdev_discard_zeroes_data(bdev)); |
279 | case BLKSECTGET: | 279 | case BLKSECTGET: |
280 | return put_ushort(arg, queue_max_sectors(bdev_get_queue(bdev))); | 280 | return put_ushort(arg, queue_max_sectors(bdev_get_queue(bdev))); |
281 | case BLKROTATIONAL: | ||
282 | return put_ushort(arg, !blk_queue_nonrot(bdev_get_queue(bdev))); | ||
281 | case BLKRASET: | 283 | case BLKRASET: |
282 | case BLKFRASET: | 284 | case BLKFRASET: |
283 | if(!capable(CAP_SYS_ADMIN)) | 285 | if(!capable(CAP_SYS_ADMIN)) |
diff --git a/include/linux/fs.h b/include/linux/fs.h index e0bc4ffb8e7f..95dd911506f1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -319,6 +319,7 @@ struct inodes_stat_t { | |||
319 | #define BLKPBSZGET _IO(0x12,123) | 319 | #define BLKPBSZGET _IO(0x12,123) |
320 | #define BLKDISCARDZEROES _IO(0x12,124) | 320 | #define BLKDISCARDZEROES _IO(0x12,124) |
321 | #define BLKSECDISCARD _IO(0x12,125) | 321 | #define BLKSECDISCARD _IO(0x12,125) |
322 | #define BLKROTATIONAL _IO(0x12,126) | ||
322 | 323 | ||
323 | #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ | 324 | #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ |
324 | #define FIBMAP _IO(0x00,1) /* bmap access */ | 325 | #define FIBMAP _IO(0x00,1) /* bmap access */ |