From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chandra Seetharaman Subject: RE: [dm-devel] failover does not work with rdac device handler Date: Mon, 06 Oct 2008 19:04:34 -0700 Message-ID: <1223345074.14830.601.camel@chandra-ubuntu> References: <00FE57DD11E3A94893D5BD54C3358BE884BF36@AUSX3MPC128.aus.amer.dell.com> ,<1223081419.14830.585.camel@chandra-ubuntu> <1223322817.14830.593.camel@chandra-ubuntu> Reply-To: sekharan@us.ibm.com Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from e31.co.us.ibm.com ([32.97.110.149]:55211 "EHLO e31.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753622AbYJGCF2 (ORCPT ); Mon, 6 Oct 2008 22:05:28 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e31.co.us.ibm.com (8.13.8/8.13.8) with ESMTP id m9725QOF009152 for ; Mon, 6 Oct 2008 22:05:26 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id m9725Qnm193572 for ; Mon, 6 Oct 2008 20:05:26 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m9724uCt015751 for ; Mon, 6 Oct 2008 20:04:57 -0600 In-Reply-To: Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: "Moger, Babu" Cc: device-mapper development , "linux-scsi@vger.kernel.org" Hi, Can you try the attached patch. chandra PS: I see a problem (not related to this patch) that the dh_state file is not getting recreated, still working on it. ------------- Keep a reference count of attaches, so that same number of detaches are allowed. Signed-off-by: Chandra Seetharaman --- Index: linux-2.6.27-rc8-git5/drivers/scsi/device_handler/scsi_dh.c =================================================================== --- linux-2.6.27-rc8-git5.orig/drivers/scsi/device_handler/scsi_dh.c +++ linux-2.6.27-rc8-git5/drivers/scsi/device_handler/scsi_dh.c @@ -153,12 +153,26 @@ static int scsi_dh_handler_attach(struct if (sdev->scsi_dh_data) { if (sdev->scsi_dh_data->scsi_dh != scsi_dh) err = -EBUSY; - } else if (scsi_dh->attach) + else + kref_get(&sdev->scsi_dh_data.kref); + } else if (scsi_dh->attach) { err = scsi_dh->attach(sdev); + if (!err) + kref_init(&sdev->scsi_dh_data.kref); + } return err; } +static void scsi_dh_release(struct *kref kref) +{ + struct scsi_dh_data *scsi_dh_data; + scsi_dh_data = container_of(kref, struct scsi_dh_data, kref); + + if (scsi_dh_data->scsi_dh && scsi_dh_data->scsi_dh->detach) + scsi_dh_data->scsi_dh->detach(sdev); +} + /* * scsi_dh_handler_detach - Detach a device handler from a device * @sdev - SCSI device the device handler should be detached from @@ -176,11 +190,7 @@ static void scsi_dh_handler_detach(struc if (scsi_dh && scsi_dh != sdev->scsi_dh_data->scsi_dh) return; - if (!scsi_dh) - scsi_dh = sdev->scsi_dh_data->scsi_dh; - - if (scsi_dh && scsi_dh->detach) - scsi_dh->detach(sdev); + kref_put(&sdev->scsi_dh_data.kref, scsi_dh_release); } /* Index: linux-2.6.27-rc8-git5/include/scsi/scsi_device.h =================================================================== --- linux-2.6.27-rc8-git5.orig/include/scsi/scsi_device.h +++ linux-2.6.27-rc8-git5/include/scsi/scsi_device.h @@ -191,6 +191,7 @@ struct scsi_device_handler { struct scsi_dh_data { struct scsi_device_handler *scsi_dh; + struct kref kref; char buf[0]; };