Hi James,

Here are the changes that are good outside the other changes :-)

scsi_lib:
	o ->errors is used as the scsi status byte for REQ_BLOCK_PC
	o ->data_len is the residual byte count
	o call __scsi_end_request even for !good_sectors if status is
	  good. This legitimately can happen for REQ_BLOCK_PC commands
	  sent from a user space program, if it gets the command setup
	  wrong (or weird). Right now this will hang that queue.

scsi_merge:
	o set SCpnt->request_bufflen to ->data_len, this is the
	  authoritative io byte count for REQ_BLOCK_PC. Here we deal in
	  bytes and not sectors.

sr + sd:
	o Set transfersize and underlow correctly for REQ_BLOCK_PC

sr_ioctl
	o We want to return -EIO for command failure, not EINVAL. That
 	  is pretty stupid :-)


===== drivers/scsi/scsi_lib.c 1.35 vs edited =====

bring it back in line with sd:
* get rid of typedefs where possible
* tab-align all credits entries
* line-wrap after 80 characters
* use C99-initializers

On Mon, Oct 28, 2002 at 01:50:53AM +0100, Andries Brouwer wrote:
> On Sun, Oct 27, 2002 at 06:05:07PM -0600, James Bottomley wrote:
>
> > If the return type will be ignored by most applications, I don't see
> > what the problem is.
>
> There is no problem. My longish reaction was mostly because you used
> "future proofing", that gave the impression that you did not know
> what this is about.
>
> > (like an obviously wrong truncation)
>
> No, the code I wrote was optimal.
> If you have 16 bits and the value is 70000, I prefer returning
> 65535 over 4464.

Why didn't you write is as patch?  James, this in Andries code
in patch from, it get's rid of the ugly sector_div so it should
be in if not just because of that.

sector_div has the same slightly strange calling convention do_div has:
it's return value is the modulo of the two operators, the division
result is in the first parameter.  Also optimize one of the expensive
64bit division away (okay, okay - it's not exactly an fast-path :))

Add a pointer to struct scsi_disk instead.  This also obsoletes
sd_dskname().

Now that only sd.c includes sd.h it can be safely merged into it.
Also get rid of typedef abuse in sd.c

sorry, the last patch I sent you contained a bogus change
for include/linux/init.h (to get around a local compile problem).

This patch backs it out.

Thanks to Patrick Mansfield for pointing this out.

Currnetly the ->bios_param for host drivers exposes struct scsi_disk
(aka Scsi_Disk or Disk) to each and every lowlevel driver, although
this structure should be privated to the sd driver.

All bios_param implementation do only use two fields:  .device and
.capacity.  This patch passes down those two directly and gets
rid of 99% of the sd.h inclusions (*).

I've tried to not break any driver with this patch, but given the
number of compiler errors in the current tree I might have missed
one or two.

(*) a bunch of drivers needed sd.h to get to scsi.h, I've fixed those.

into mulgrave.(none):/home/jejb/BK/scsi-misc-2.5

In 2.5.44 it contains only two functions, that both have exactly
one caller in other files and both are entirely unrelated to
request merging..

into aladin.rdu.redhat.com:/usr/src/2.5

the ->finish method is a relicat from the old day were we never had
hotplugging and allowed the driver to do fixups after all busses
had been scanned.  Nowdays only sd and sr actually implement it,
and both only defer actions to there that should actually happen in
->attach.  Change both drivers to move that code into ->attach,
clenaup the Templates to use C99 initializers and get rid of the
methods.

This also cleans up some very crude race-avoidable code in those
drivers, btw..

When a scsi device is offlined and then the system is shutdown it will
hang during the synchronizing SCSI caches task. The error handler was
activated during this step, but post recovery the system did not
complete the shutdown.

This patch just adds a check for online before sending the command. The
better approach appeared to be to use scsi_block_when_processing_errors,
but I was concerned that we might block to long in a shutdown case.

-andmike
--
Michael Anderson
andmike@us.ibm.com

 sd.c |    3 +++
 1 files changed, 3 insertions(+)

This patch corrects a problem in scsi error handling.

When a device is offlined indicated by a message like ...Device offlined
- not ready...

the command return status was not being updated with a failure status if
the IO was a timeout.

I tested the patch on system with ips, aic, and qlogic fc adapters, but
was unable to generate a satisfactory device offline test case.

I did test this fix on uml with scsi_debug and generated a device
offline condition with verified this fix was working correctly.

-andmike
--
Michael Anderson
andmike@us.ibm.com

 scsi_error.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Scsi Host setup.

This caused the following errors on trying to compile.

drivers/scsi/inia100.c:98: unknown field `next' specified in initializer
drivers/scsi/inia100.c:98: warning: missing braces around initializer
drivers/scsi/inia100.c:98: warning: (near initialization for `driver_template.shtp_list')
drivers/scsi/inia100.c:98: unknown field `module' specified in initializer
drivers/scsi/inia100.c:98: unknown field `proc_name' specified in initializer
drivers/scsi/inia100.c:98: warning: initialization from incompatible pointer type
make[2]: *** [drivers/scsi/inia100.o] Error 1

Several of the drivers Mike modified only had the one-line change to remove
the 'next' field.  I tried it and bingo, it works and passed my tests.

The version change is what Doug Ledford intended in patch-2.5.25 back in
June 2002.  (See inia100.c "inia100_Version")

	It looks like sg.c was missed in the update from put_device to
	device_unregister.

break at compiletime instead of runtime


===== drivers/scsi/hosts.h 1.19 vs edited =====

The problem was that when the refcount hit 0, it was unconditionally
assuming that it had been added, which is wrong.  The patch below
corrects that, and fixes the Oops when loading the floppy driver.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

Several ports (x86-64,ppc64,sparc64) which do 32bit ioctl emulation
have functions for drivers to let them define their own translation
handlers. So far it was a bit complicated to use because there
was no standard include file that declares the prototypes for this
stuff. Then drivers and other subsystems can start to declare their own
ioctl translation handlers.

This patch add include/linux/ioctl32.h to fix this.

The actual implementation is in arch specific code. It has been coordinated
with DaveM and Anton.

This patch is needed for the x86-64 merge I sent in separate mail.

There is currently no preprocessor symbol that the drivers can test
to see if they should use this. So far they have to check arch symbols.
This will be fixed later when all 64bit ports that need it add the dynamic
ioctl registration API too (that's ia64,s390x,mips64)

This fixes a few files that got lost with the last merge and merges
with 2.5.43/i386.  Only changes architecture specific files.

It depends on one other patch (for linux/ioctl32.h) which I'm sending
separately.

Changes:
- Include missing files (pageattr.c) and Makefile changes
- Update IA32 subsystem. Various small fixes and a big merge
  with sparc64.
- Change HZ to 1000
- Merge some of the 2.5.43/i386 profiling changes. No full oprofile yet.
- Fix many warnings
- Update defconfig
- Various other smaller cleanups and bugfixes.

        * switched to private queues
        * set ->queue

into home.transmeta.com:/home/torvalds/v2.5/linux

        * switched to private queues
        * set ->queue and ->private_data
        * switched to use of ->bd_disk/->rq_disk
        * merged private blocksize, etc. arrays into nbd_dev[]
        * cleaned up

        * switched to private queues
        * set ->queue and ->private_data
	* switched to use of ->rq_disk

	sbpcd.c: removes bogus duplicate definition of sbpcd_lock, use of
CURRENT (we are using private queue) and call of invalidate_buffers() in
->media_changed() (caller does it itself).  That went in a changeset from
davej - looks like a merge problem...
	sr.c: braino in ifdefed printk - s/disk/cd->disk/.  Thanks to jejb
for spotting that one...

into home.transmeta.com:/home/torvalds/v2.5/linux