From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030943AbXDXADd (ORCPT ); Mon, 23 Apr 2007 20:03:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030937AbXDXADH (ORCPT ); Mon, 23 Apr 2007 20:03:07 -0400 Received: from mga09.intel.com ([134.134.136.24]:24293 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030914AbXDXACv (ORCPT ); Mon, 23 Apr 2007 20:02:51 -0400 X-ExtLoop1: 1 X-IronPort-AV: i="4.14,443,1170662400"; d="scan'208"; a="78044114:sNHT97816707" Date: Mon, 23 Apr 2007 17:00:18 -0700 From: Kristen Carlson Accardi To: jeff@garzik.org Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, htejun@gmail.com, Kristen Carlson Accardi Subject: [patch 6/7] SCSI: save disk in scsi_device Message-Id: <20070423170018.9cc9faef.kristen.c.accardi@intel.com> In-Reply-To: <20070424074856.005152262@intel.com> References: <20070424074856.005152262@intel.com> X-Mailer: Sylpheed version 2.2.10 (GTK+ 2.10.8; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Give anyone who has access to scsi_device access to the genhd struct as well. Signed-off-by: Kristen Carlson Accardi Index: 2.6-git/drivers/scsi/sd.c =================================================================== --- 2.6-git.orig/drivers/scsi/sd.c +++ 2.6-git/drivers/scsi/sd.c @@ -1711,6 +1711,7 @@ static int sd_probe(struct device *dev) dev_set_drvdata(dev, sdkp); add_disk(gd); + sdp->disk = gd; sdev_printk(KERN_NOTICE, sdp, "Attached scsi %sdisk %s\n", sdp->removable ? "removable " : "", gd->disk_name); Index: 2.6-git/drivers/scsi/sr.c =================================================================== --- 2.6-git.orig/drivers/scsi/sr.c +++ 2.6-git/drivers/scsi/sr.c @@ -604,6 +604,7 @@ static int sr_probe(struct device *dev) if (sdev->media_change_notify) disk->flags |= GENHD_FL_MEDIA_CHANGE_NOTIFY; add_disk(disk); + sdev->disk = disk; sdev_printk(KERN_DEBUG, sdev, "Attached scsi CD-ROM %s\n", cd->cdi.name); Index: 2.6-git/include/scsi/scsi_device.h =================================================================== --- 2.6-git.orig/include/scsi/scsi_device.h +++ 2.6-git/include/scsi/scsi_device.h @@ -138,7 +138,7 @@ struct scsi_device { struct device sdev_gendev; struct class_device sdev_classdev; - + struct gendisk *disk; struct execute_work ew; /* used to get process context on put */ enum scsi_device_state sdev_state; --