Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[cascardo/linux.git] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index 1f4d1de..be48ea5 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -280,6 +280,8 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                return put_uint(arg, bdev_io_opt(bdev));
        case BLKALIGNOFF:
                return put_int(arg, bdev_alignment_offset(bdev));
+       case BLKDISCARDZEROES:
+               return put_uint(arg, bdev_discard_zeroes_data(bdev));
        case BLKSECTGET:
                return put_ushort(arg, queue_max_sectors(bdev_get_queue(bdev)));
        case BLKRASET: