From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chandra Seetharaman Subject: Re: [patch 04/16] git-scsi-misc: fix SCSI_DH build errors Date: Mon, 07 Jul 2008 18:02:29 -0700 Message-ID: <1215478949.27507.88.camel@chandra-ubuntu> References: <200807040647.m646lPjk017478@imap1.linux-foundation.org> <1215468655.3274.45.camel@localhost.localdomain> Reply-To: sekharan@us.ibm.com Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from e36.co.us.ibm.com ([32.97.110.154]:36393 "EHLO e36.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755177AbYGHBCn (ORCPT ); Mon, 7 Jul 2008 21:02:43 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e36.co.us.ibm.com (8.13.8/8.13.8) with ESMTP id m6812gUq024891 for ; Mon, 7 Jul 2008 21:02:42 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v9.0) with ESMTP id m6812gbB079910 for ; Mon, 7 Jul 2008 19:02:42 -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 m6812c7L026825 for ; Mon, 7 Jul 2008 19:02:42 -0600 In-Reply-To: <1215468655.3274.45.camel@localhost.localdomain> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James Bottomley Cc: akpm@linux-foundation.org, linux-scsi@vger.kernel.org, agk@redhat.com, andmike@us.ibm.com, hare@suse.de, michaelc@cs.wisc.edu, randy.dunlap@oracle.com On Mon, 2008-07-07 at 17:10 -0500, James Bottomley wrote: > On Thu, 2008-07-03 at 23:47 -0700, akpm@linux-foundation.org wrote: > > From: Chandra Seetharaman > > > > Do not automatically "select" SCSI_DH for dm-multipath. If SCSI_DH > > doesn't exist, just do not allow hardware handlers to be used. > > > > Handle SCSI_DH being a module also. Make sure it doesn't allow DM_MULTIPATH > > to be compiled in when SCSI_DH is a module. > > > > Signed-off-by: Chandra Seetharaman > > Reported-by: Randy Dunlap > > Reported-by: Andrew Morton > > Cc: James Bottomley > > Cc: Alasdair G Kergon > > Cc: Mike Christie > > Cc: Mike Anderson > > Cc: Hannes Reinecke > > Signed-off-by: Andrew Morton > > --- > > > > drivers/md/Kconfig | 2 +- > > drivers/md/dm-mpath.c | 2 ++ > > include/scsi/scsi_dh.h | 12 +++++++++++- > > 3 files changed, 14 insertions(+), 2 deletions(-) > > > > diff -puN drivers/md/Kconfig~git-scsi-misc-fix-scsi_dh-build-errors drivers/md/Kconfig > > --- a/drivers/md/Kconfig~git-scsi-misc-fix-scsi_dh-build-errors > > +++ a/drivers/md/Kconfig > > @@ -252,7 +252,7 @@ config DM_ZERO > > config DM_MULTIPATH > > tristate "Multipath target" > > depends on BLK_DEV_DM > > - select SCSI_DH > > + depends on SCSI_DH || !SCSI_DH > > This is a bit horrible. It's not very obvious what it means and it > critically depends on the current !m == m behaviour. I couldn't find other way to solve this dependency. Will look into that again. > > > ---help--- > > Allow volume managers to support multipath hardware. > > > > diff -puN drivers/md/dm-mpath.c~git-scsi-misc-fix-scsi_dh-build-errors drivers/md/dm-mpath.c > > --- a/drivers/md/dm-mpath.c~git-scsi-misc-fix-scsi_dh-build-errors > > +++ a/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; > > This looks like some type of separate bug fix ... it's certainly not > mentioned in the change log and has nothing to do with modular compile > problems. That is true. I can create a separate patch for this. > > James > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html