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: 56212 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 49AB01007D4 for ; Sat, 19 Jun 2010 04:42:48 +1000 (EST) Received: from localhost ([127.0.0.1]:39478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPgWb-0002iw-2J for incoming@patchwork.ozlabs.org; Fri, 18 Jun 2010 14:42:45 -0400 Received: from [140.186.70.92] (port=40464 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPgSX-0007ck-Mc for qemu-devel@nongnu.org; Fri, 18 Jun 2010 14:38:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OPgSO-0006Vl-Gw for qemu-devel@nongnu.org; Fri, 18 Jun 2010 14:38:25 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:37345) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OPgSO-0006VW-Ah for qemu-devel@nongnu.org; Fri, 18 Jun 2010 14:38:24 -0400 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5IIVBix023301 for ; Fri, 18 Jun 2010 12:31:11 -0600 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5IIc8vA128260 for ; Fri, 18 Jun 2010 12:38:08 -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 o5IIc77H023984 for ; Fri, 18 Jun 2010 12:38:07 -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 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Rusty Russell , qemu-devel@nongnu.org, kvm@vger.kernel.org, Ryan Harper Subject: [Qemu-devel] [PATCH 2/2] Remove virtio_blk VBID ioctl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org With the availablility of a sysfs device attribute for examining disk serial numbers the ioctl is no longer needed. The user-space changes for this aren't upstream yet so we don't have any users to worry about. Signed-off-by: Ryan Harper --- drivers/block/virtio_blk.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) 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. */