From patchwork Fri Sep 7 13:39:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1422491 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 99761DF283 for ; Fri, 7 Sep 2012 13:40:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760671Ab2IGNjr (ORCPT ); Fri, 7 Sep 2012 09:39:47 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:60946 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760641Ab2IGNjp (ORCPT ); Fri, 7 Sep 2012 09:39:45 -0400 Received: by mail-ie0-f174.google.com with SMTP id e11so5001652iej.19 for ; Fri, 07 Sep 2012 06:39:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=OwYwJoseUpJbG528AUIg9ppJIiaC7XBp1O4PtbkmF5o=; b=VL+fayot1lfpYhLAvzXNVnRYG+xn5u2XzAPyAe5Q6wrQnvgLppQX8OZVqqD5XUxeK7 dd5Zp0MQMj6Kbi+AeW2uACgJGE6ldHO2Glxdg68G0pN/zAhcAfd/tKkev8jINEAELuUy c+PTwMnu+TSUQed+Yp8/d7qKfp6vv85Utf0CAaaJ0w+s3RE///omNmPx/HB0QXdVfC9J ncAc07AusQCofKXYfeoMck2gSTPGLOMpomxJzUq13O7DrsxrTgbDtgw4FNYkiYG3k/Uy VFbNk58SJownj/fuE1E0iX6uFkvh7v4L8swPC4xTye0QsGKIuPMfAx5edO8/5gayKnr9 TUOA== Received: by 10.42.95.10 with SMTP id d10mr7038032icn.30.1347025185331; Fri, 07 Sep 2012 06:39:45 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id ua5sm8133377igb.10.2012.09.07.06.39.43 (version=SSLv3 cipher=OTHER); Fri, 07 Sep 2012 06:39:44 -0700 (PDT) Message-ID: <5049F91F.3090306@inktank.com> Date: Fri, 07 Sep 2012 08:39:43 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 4/5] rbd: kill rbd_dev->q References: <5049F7F5.1070609@inktank.com> In-Reply-To: <5049F7F5.1070609@inktank.com> X-Gm-Message-State: ALoCoQmYvp8zNAfClIBUmuszNpoV829LuM4lAQDjVAKt+b4wKwlTnYIeWdzFvzZ+eYWxxa6QfDM8 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org A copy of rbd_dev->disk->queue is held in rbd_dev->q, but it's never actually used. So get just get rid of the field. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 7726368..774a36b 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -155,7 +155,6 @@ struct rbd_device { int major; /* blkdev assigned major */ struct gendisk *disk; /* blkdev's gendisk and rq */ - struct request_queue *q; struct rbd_options rbd_opts; struct rbd_client *rbd_client; @@ -1923,7 +1922,6 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) q->queuedata = rbd_dev; rbd_dev->disk = disk; - rbd_dev->q = q; /* finally, announce the disk to the world */ set_capacity(disk, total_size / SECTOR_SIZE);