module: neaten __find_symbol, rename to find_symbol

[linux-2.6-omap-h63xx.git] / block / compat_ioctl.c

diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index cae0a852619e372a7a2e87b53b7f818a402f8d86..c70d0b6f666fff96feb69f97fe9ed30e2990fa19 100644 (file)
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -545,6 +545,7 @@ static int compat_blk_trace_setup(struct block_device *bdev, char __user *arg)
        struct blk_user_trace_setup buts;
        struct compat_blk_user_trace_setup cbuts;
        struct request_queue *q;
+       char b[BDEVNAME_SIZE];
        int ret;
 
        q = bdev_get_queue(bdev);
@@ -554,6 +555,8 @@ static int compat_blk_trace_setup(struct block_device *bdev, char __user *arg)
        if (copy_from_user(&cbuts, arg, sizeof(cbuts)))
                return -EFAULT;
 
+       strcpy(b, bdevname(bdev, b));
+
        buts = (struct blk_user_trace_setup) {
                .act_mask = cbuts.act_mask,
                .buf_size = cbuts.buf_size,
@@ -565,7 +568,7 @@ static int compat_blk_trace_setup(struct block_device *bdev, char __user *arg)
        memcpy(&buts.name, &cbuts.name, 32);
 
        mutex_lock(&bdev->bd_mutex);
-       ret = do_blk_trace_setup(q, bdev, &buts);
+       ret = do_blk_trace_setup(q, b, bdev->bd_dev, &buts);
        mutex_unlock(&bdev->bd_mutex);
        if (ret)
                return ret;
@@ -621,7 +624,6 @@ static int compat_blkdev_driver_ioctl(struct inode *inode, struct file *file,
        case HDIO_GET_IDENTITY:
        case HDIO_DRIVE_TASK:
        case HDIO_DRIVE_CMD:
-       case HDIO_SCAN_HWIF:
        /* 0x330 is reserved -- it used to be HDIO_GETGEO_BIG */
        case 0x330:
        /* 0x02 -- Floppy ioctls */