Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block

[~andy/linux] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index 4828fa34981314f34555a2e85ed381d660d9fa3b..ba15b2dbfb98ea55911109543f35889ea7b615da 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -296,6 +296,8 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                return put_uint(arg, bdev_discard_zeroes_data(bdev));
        case BLKSECTGET:
                return put_ushort(arg, queue_max_sectors(bdev_get_queue(bdev)));
+       case BLKROTATIONAL:
+               return put_ushort(arg, !blk_queue_nonrot(bdev_get_queue(bdev)));
        case BLKRASET:
        case BLKFRASET:
                if(!capable(CAP_SYS_ADMIN))