From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1763693AbYEWD0V@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1763693AbYEWD0V (ORCPT <rfc822;w@1wt.eu>);
	Thu, 22 May 2008 23:26:21 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756155AbYEWD0J
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 22 May 2008 23:26:09 -0400
Received: from smtp1.linux-foundation.org ([140.211.169.13]:49192 "EHLO
	smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751004AbYEWD0G (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 22 May 2008 23:26:06 -0400
Date: Thu, 22 May 2008 20:25:43 -0700
From: Andrew Morton <akpm@linux-foundation.org>
To: sekharan@us.ibm.com
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
       Randy Dunlap <randy.dunlap@oracle.com>, linux-kernel@vger.kernel.org,
       hare@suse.de, scsi <linux-scsi@vger.kernel.org>
Subject: Re: 2.6.26-rc2-mm1 (SCSI_DH build errors)
Message-Id: <20080522202543.d15e8c3b.akpm@linux-foundation.org>
In-Reply-To: <1210881374.21974.285.camel@chandra-ubuntu>
References: <20080514010129.4f672378.akpm@linux-foundation.org>
	<20080514141348.e71feed6.randy.dunlap@oracle.com>
	<1210862779.15852.4.camel@localhost.localdomain>
	<1210881374.21974.285.camel@chandra-ubuntu>
X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-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
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, 15 May 2008 12:56:14 -0700 Chandra Seetharaman <sekharan@us.ibm.com> wrote:

> Hi James, Andrew,
> 
> Here is a patch to remove the automatic "select" of scsi_dh for
> dm-multipath.
> 
> Sorry about the mishap.
>
>

This is busted.

> Do not automatically "select" SCSI_DH for dm-multipath. If SCSI_DH
> doesn't exist,just do not allow  hardware handlers to be used.
> 
> Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com>
> ---
> 
> Index: scsi-misc-2.6/drivers/md/Kconfig
> ===================================================================
> --- scsi-misc-2.6.orig/drivers/md/Kconfig
> +++ scsi-misc-2.6/drivers/md/Kconfig
> @@ -252,7 +252,6 @@ config DM_ZERO
>  config DM_MULTIPATH
>  	tristate "Multipath target"
>  	depends on BLK_DEV_DM
> -	select SCSI_DH
>  	---help---
>  	  Allow volume managers to support multipath hardware.
>  
> Index: scsi-misc-2.6/drivers/md/dm-mpath.c
> ===================================================================
> --- scsi-misc-2.6.orig/drivers/md/dm-mpath.c
> +++ scsi-misc-2.6/drivers/md/dm-mpath.c
> @@ -664,6 +664,8 @@ static int parse_hw_handler(struct arg_s
>  	request_module("scsi_dh_%s", m->hw_handler_name);
>  	if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {
>  		ti->error = "unknown hardware handler type";
> +		kfree(m->hw_handler_name);
> +		m->hw_handler_name = NULL;
>  		return -EINVAL;
>  	}
>  	consume(as, hw_argc - 1);
> Index: scsi-misc-2.6/include/scsi/scsi_dh.h
> ===================================================================
> --- scsi-misc-2.6.orig/include/scsi/scsi_dh.h
> +++ scsi-misc-2.6/include/scsi/scsi_dh.h
> @@ -54,6 +54,16 @@ enum {
>  	SCSI_DH_NOSYS,
>  	SCSI_DH_DRIVER_MAX,
>  };
> -
> +#ifdef CONFIG_SCSI_DH
>  extern int scsi_dh_activate(struct request_queue *);
>  extern int scsi_dh_handler_exist(const char *);
> +#else
> +inline int scsi_dh_activate(struct request_queue *req)
> +{
> +	return 0;
> +}
> +inline int scsi_dh_handler_exist(const char *name)
> +{
> +	return 0;
> +}
> +#endif

You obviously wanted `static inline' there, but it still fails i386
allmodconfig compilation.