[PATCH] switch virtio_blk (4e109852) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/block/virtio_blk.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -146,11 +146,11 @@ static void do_virtblk_request(struct request_queue *q)
	vblk->vq->vq_ops->kick(vblk->vq);		vblk->vq->vq_ops->kick(vblk->vq);
	}		}

	static int virtblk_ioctl(struct inode inode, struct file filp,		static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
	unsigned cmd, unsigned long data)		unsigned cmd, unsigned long data)
	{		{
	return scsi_cmd_ioctl(inode->i_bdev->bd_disk->queue,		return scsi_cmd_ioctl(bdev->bd_disk->queue,
	inode->i_bdev->bd_disk, filp->f_mode, cmd,		bdev->bd_disk, mode, cmd,
	(void __user *)data);		(void __user *)data);
	}		}

	@@ -180,7 +180,7 @@ static int virtblk_getgeo(struct block_device bd, struct hd_geometry geo)
	}		}

	static struct block_device_operations virtblk_fops = {		static struct block_device_operations virtblk_fops = {
	.__ioctl = virtblk_ioctl,		.locked_ioctl = virtblk_ioctl,
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.getgeo = virtblk_getgeo,		.getgeo = virtblk_getgeo,
	};		};