[PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Mike Miller]

Patch 6 of 6

Bug fix. If SCSI tape support is turned off we get an implicit declaration
of cciss_unregister_scsi error in cciss_remove_one.
Please consider this for inclusion.

Thanks,
mikem

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Stephen M. Cameron <scameron@beardog.cca.cpqcorp.net>

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index ae663db..262148b 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3616,7 +3616,9 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
 		}
 	}
 
+#ifdef CONFIG_CISS_SCSI_TAPE
 	cciss_unregister_scsi(i);	/* unhook from SCSI subsystem */
+#endif
 
 	cciss_shutdown(pdev);
 

Re: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Jens Axboe]

On Wed, Jul 30 2008, Mike Miller wrote:
> Patch 6 of 6
> 
> Bug fix. If SCSI tape support is turned off we get an implicit declaration
> of cciss_unregister_scsi error in cciss_remove_one.
> Please consider this for inclusion.

Applied 1-6, thanks.

-- 
Jens Axboe

Re: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Andrew Morton]

On Mon, 4 Aug 2008 11:56:33 +0200
Jens Axboe <jens.axboe@oracle.com> wrote:

> On Wed, Jul 30 2008, Mike Miller wrote:
> > Patch 6 of 6
> > 
> > Bug fix. If SCSI tape support is turned off we get an implicit declaration
> > of cciss_unregister_scsi error in cciss_remove_one.
> > Please consider this for inclusion.
> 
> Applied 1-6, thanks.

I'm not seeing these changes in linux-next nor in
master.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git#for-next
nor in #for-akpm.

Also, #for-next is empty, but #for-akpm has the single commit

    commit 7b87c0541a2d606c0b1a47fa8afbaeb32fad6d60
    Author: Jens Axboe <jens.axboe@oracle.com>
    Date:   Wed Jun 25 12:04:48 2008 +0200

        vmsplice: implement real vmsplice to userspace

Re: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]

On Tue, 5 Aug 2008 15:30:12 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> I'm not seeing these changes in linux-next nor in
> master.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git#for-next
> nor in #for-akpm.

Well linux-next gets its block tree from
git://git.kernel.dk/linux-2.6-block.git#for-next (which appears to be
very similar - if not identical to - the above).

> Also, #for-next is empty, but #for-akpm has the single commit

The for-linus branch seems to have a few commits, though ...
Jens, would you like that in linux-next as block-current (merged early -
meant for bug fixes destined for the current release)?

>         vmsplice: implement real vmsplice to userspace

Yeah, that looks way to scary for linux-next :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Jens Axboe]

On Wed, Aug 06 2008, Stephen Rothwell wrote:
> On Tue, 5 Aug 2008 15:30:12 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > I'm not seeing these changes in linux-next nor in
> > master.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git#for-next
> > nor in #for-akpm.
> 
> Well linux-next gets its block tree from
> git://git.kernel.dk/linux-2.6-block.git#for-next (which appears to be
> very similar - if not identical to - the above).
> 
> > Also, #for-next is empty, but #for-akpm has the single commit
> 
> The for-linus branch seems to have a few commits, though ...
> Jens, would you like that in linux-next as block-current (merged early -
> meant for bug fixes destined for the current release)?

Thanks, but just keep pulling linux-next and I'll try and get them
uptodate more frequently :-)

-- 
Jens Axboe

Re: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

Hi Jens,

On Wed, 6 Aug 2008 12:33:08 +0200 Jens Axboe <jens.axboe@oracle.com> wrote:
>
> Thanks, but just keep pulling linux-next and I'll try and get them
> uptodate more frequently :-)

OK, will do.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

RE: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Miller, Mike (OS Dev)]

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Wednesday, August 06, 2008 6:43 PM
> To: Jens Axboe
> Cc: Andrew Morton; Miller, Mike (OS Dev);
> linux-kernel@vger.kernel.org; linux-scsi@vger.kernel.org
> Subject: Re: [PATCH 6/6] cciss: fix bug if scsi tape support
> is disabled
>
> Hi Jens,
>
> On Wed, 6 Aug 2008 12:33:08 +0200 Jens Axboe
> <jens.axboe@oracle.com> wrote:
> >
> > Thanks, but just keep pulling linux-next and I'll try and get them
> > uptodate more frequently :-)
>

I still can't find my latest patches in any tree. Jens?

-- mikem

Re: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Jens Axboe]

On Thu, Aug 07 2008, Miller, Mike (OS Dev) wrote:
> 
> 
> > -----Original Message-----
> > From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> > Sent: Wednesday, August 06, 2008 6:43 PM
> > To: Jens Axboe
> > Cc: Andrew Morton; Miller, Mike (OS Dev);
> > linux-kernel@vger.kernel.org; linux-scsi@vger.kernel.org
> > Subject: Re: [PATCH 6/6] cciss: fix bug if scsi tape support
> > is disabled
> >
> > Hi Jens,
> >
> > On Wed, 6 Aug 2008 12:33:08 +0200 Jens Axboe
> > <jens.axboe@oracle.com> wrote:
> > >
> > > Thanks, but just keep pulling linux-next and I'll try and get them
> > > uptodate more frequently :-)
> >
> 
> I still can't find my latest patches in any tree. Jens?

It's in for-next, for-akpm, and for-linus. It'll be going upstream for
this release, 2.6.27.

-- 
Jens Axboe

RE: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Miller, Mike (OS Dev)]

Jens wrote:

> > > > uptodate more frequently :-)
> > >
> >
> > I still can't find my latest patches in any tree. Jens?
>
> It's in for-next, for-akpm, and for-linus. It'll be going
> upstream for this release, 2.6.27.

Thanks, I'm just a bit impatient I guess. When a patch makes into for-* how long would it take to get to Linus' git tree?

-- mikem

Re: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Jens Axboe]

On Thu, Aug 07 2008, Miller, Mike (OS Dev) wrote:
> Jens wrote:
> 
> > > > > uptodate more frequently :-)
> > > >
> > >
> > > I still can't find my latest patches in any tree. Jens?
> >
> > It's in for-next, for-akpm, and for-linus. It'll be going
> > upstream for this release, 2.6.27.
> 
> Thanks, I'm just a bit impatient I guess. When a patch makes into
> for-* how long would it take to get to Linus' git tree?

Oh that depends entirely on what else it's queued with, but for
something going into the current branch, usually 2 weeks at the most.

-- 
Jens Axboe

Re: [PATCH 6/6] cciss: fix bug if scsi tape support is disabled

[Jens Axboe]

On Tue, Aug 05 2008, Andrew Morton wrote:
> On Mon, 4 Aug 2008 11:56:33 +0200
> Jens Axboe <jens.axboe@oracle.com> wrote:
> 
> > On Wed, Jul 30 2008, Mike Miller wrote:
> > > Patch 6 of 6
> > > 
> > > Bug fix. If SCSI tape support is turned off we get an implicit declaration
> > > of cciss_unregister_scsi error in cciss_remove_one.
> > > Please consider this for inclusion.
> > 
> > Applied 1-6, thanks.
> 
> I'm not seeing these changes in linux-next nor in
> master.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git#for-next
> nor in #for-akpm.

Both are fixed up now!

> Also, #for-next is empty, but #for-akpm has the single commit
> 
>     commit 7b87c0541a2d606c0b1a47fa8afbaeb32fad6d60
>     Author: Jens Axboe <jens.axboe@oracle.com>
>     Date:   Wed Jun 25 12:04:48 2008 +0200
> 
>         vmsplice: implement real vmsplice to userspace

Not sure what to do about that one, actually. It's relatively simple,
but... I'll probaly send it out for review soonish on linux-mm and
linux-kernel.

-- 
Jens Axboe