X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2Fcompat_ioctl.c;h=7865a34e0faaaba07cb9e4946dca6406b303bef1;hb=1392e3b33319fd1a2527bebfc56631c2f2d3c7c5;hp=f8c218cd08e193d206c8b40dc18750ac1bdaa804;hpb=d0deef5b14af7d5bbd0003a0a2a1a32326e20a6d;p=safe%2Fjmp%2Flinux-2.6 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index f8c218c..7865a34 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -763,10 +763,10 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */ return compat_put_int(arg, block_size(bdev)); case BLKSSZGET: /* get block device hardware sector size */ - return compat_put_int(arg, bdev_hardsect_size(bdev)); + return compat_put_int(arg, bdev_logical_block_size(bdev)); case BLKSECTGET: return compat_put_ushort(arg, - bdev_get_queue(bdev)->max_sectors); + queue_max_sectors(bdev_get_queue(bdev))); case BLKRASET: /* compatible, but no compat_ptr (!) */ case BLKFRASET: if (!capable(CAP_SYS_ADMIN))