From patchwork Fri Jun 18 18:38:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harper X-Patchwork-Id: 106888 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5IIcM3f015781 for ; Fri, 18 Jun 2010 18:38:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751877Ab0FRSiU (ORCPT ); Fri, 18 Jun 2010 14:38:20 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:52432 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751647Ab0FRSiT (ORCPT ); Fri, 18 Jun 2010 14:38:19 -0400 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e39.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5IIT7S8027521 for ; Fri, 18 Jun 2010 12:29:07 -0600 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5IIc8jZ090782 for ; Fri, 18 Jun 2010 12:38:15 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5IIc77N023984 for ; Fri, 18 Jun 2010 12:38:08 -0600 Received: from localhost.localdomain (symmetry-009053041164.austin.ibm.com [9.53.41.164]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5IIc4rD023890; Fri, 18 Jun 2010 12:38:07 -0600 From: Ryan Harper To: virtualization@lists.linux-foundation.org Cc: Rusty Russell , kvm@vger.kernel.org, qemu-devel@nongnu.org, Ryan Harper Subject: [PATCH 2/2] Remove virtio_blk VBID ioctl Date: Fri, 18 Jun 2010 13:38:03 -0500 Message-Id: <1276886283-1571-2-git-send-email-ryanh@us.ibm.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1276886283-1571-1-git-send-email-ryanh@us.ibm.com> References: <1276886283-1571-1-git-send-email-ryanh@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 18 Jun 2010 18:38:23 +0000 (UTC) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index f1ef26f..9e382dd 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -225,16 +225,6 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, struct gendisk *disk = bdev->bd_disk; struct virtio_blk *vblk = disk->private_data; - if (cmd == 0x56424944) { /* 'VBID' */ - void __user *usr_data = (void __user *)data; - char id_str[VIRTIO_BLK_ID_BYTES]; - int err; - - err = virtblk_get_id(disk, id_str); - if (!err && copy_to_user(usr_data, id_str, VIRTIO_BLK_ID_BYTES)) - err = -EFAULT; - return err; - } /* * Only allow the generic SCSI ioctls if the host can support it. */