into flossy.devel.redhat.com:/usr/local/home/dledford/bk/linus-2.5

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

into flossy.devel.redhat.com:/usr/local/home/dledford/bk/linus-2.5

On Thu, Nov 21, 2002 at 02:23:14AM +0100, Christoph Hellwig wrote:
> two new helpers in scsi_scan.c: scsi_add_single_device and
> scsi_remove_single_device that do all hard work.  Thanks to
> beeing in scsi_scan.c and using proper helpers they're a lot
> smaller and cleaner.
>
>
> --- 1.44/drivers/scsi/scsi.h	Sun Nov 17 16:44:35 2002
> +++ edited/drivers/scsi/scsi.h	Thu Nov 21 01:05:39 2002
> -
> -		err = -ENOSYS;
> -		if (sdev)
> -			goto out;	/* We do not yet support unplugging */
> -
> -		scan_scsis(shost, 1, channel, id, lun);
> -		err = length;
> -		goto out;
> -	}
> +		err = scsi_add_single_device(host, channel, id, lun);
> +		if (err >= 0)
> +			err = length;

> ===== drivers/scsi/scsi_scan.c 1.38 vs edited =====
> --- 1.38/drivers/scsi/scsi_scan.c	Sun Nov 17 16:47:20 2002
> +++ edited/drivers/scsi/scsi_scan.c	Thu Nov 21 01:16:03 2002
> @@ -1862,6 +1862,69 @@
>
>  }
>
> +int scsi_add_single_device(uint host, uint channel, uint id, uint lun)
> +{
> +	struct scsi_device *sdevscan, *sdev;
> +	struct Scsi_Host *shost;
> +	int error = -ENODEV;
> +
> +	shost = scsi_host_hn_get(host);
> +	if (!shost)
> +		return -ENODEV;
> +	sdev = scsi_find_device(shost, channel, id, lun);
> +	if (!sdev)
> +		goto out;
> +

James/Christoph -

I had to change the above to a "if (sdev)" per the following patch (against
current scsi-misc-2.5) to get the add to work correctly. Otherwise, this
worked fine.

On Thu, Nov 21, 2002 at 10:12:23AM -0600, J.E.J. Bottomley wrote:
> The scsi-misc-2.5 resync should be done now.
>
> James

Hi -

hardirq.h and init.h were removed from scsi.h. So I had to make the
following changes to compile. I also removed two extraneous includes.

this function was a multiplexer for two very different things, but
with my last patch one of those faded away and only one callers
is left.  Simplify it to what's still needed and rename to
scsi_scan_host.

two new helpers in scsi_scan.c: scsi_add_single_device and
scsi_remove_single_device that do all hard work.  Thanks to
beeing in scsi_scan.c and using proper helpers they're a lot
smaller and cleaner.

just a simple code cleanup

This time I explicitly checked for the in_atomic mess..

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

	full events at the mid layer instead of at the low level device
	driver

into flossy.devel.redhat.com:/usr/local/home/dledford/bk/linus-2.5

into flossy.devel.redhat.com:/usr/local/home/dledford/bk/linus-2.5

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

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

On Sun, Nov 17, 2002 at 11:54:49PM +0100, Christoph Hellwig wrote:

> --- 1.46/drivers/scsi/scsi_lib.c	Thu Nov 14 18:09:17 2002
> +++ edited/drivers/scsi/scsi_lib.c	Sun Nov 17 21:37:05 2002
> @@ -7,50 +7,18 @@
>   *                        of people at Linux Expo.
>   */
>
> -/*
> - * The fundamental purpose of this file is to contain a library of utility
> - * routines that can be used by low-level drivers.   Ultimately the idea
> - * is that there should be a sufficiently rich number of functions that it
> - * would be possible for a driver author to fashion a queueing function for
> - * a low-level driver if they wished.   Note however that this file also
> - * contains the "default" versions of these functions, as we don't want to
> - * go through and retrofit queueing functions into all 30 some-odd drivers.
> - */
> -
> -#include <linux/module.h>
> -
> -#include <linux/sched.h>
> -#include <linux/timer.h>
>  #include <linux/string.h>
>  #include <linux/slab.h>
>  #include <linux/bio.h>
> -#include <linux/ioport.h>
>  #include <linux/kernel.h>
> -#include <linux/stat.h>
>  #include <linux/blk.h>
> -#include <linux/interrupt.h>
> -#include <linux/delay.h>
> -#include <linux/smp_lock.h>
>  #include <linux/completion.h>
>
> -
> -#define __KERNEL_SYSCALLS__
> -
> -#include <linux/unistd.h>

I had to add back the smp_lock.h include to compile with CONFIG_PREEMPT,
as kernel_locked was not defined and is used by in_atomic().

Patch against the latest scsi-misc-2.5:

Fix is to only plug on prep deferral if the device queue is empty
(otherwise we can rely on returning I/O to restart the queue)

* Fix compile warning in matroxfb when only 8bpp support is enabled.
* Set memory type correctly on Matrox G400.

* Executable files on ncpfs are marked by combination of SHARED and
  SYSTEM attribute, not by SYSTEM attribute alone.

  After this change gcc output is really marked executable on ncpfs.

lcall7 and lcall27 code paths are almost identical, except one
constant. This code merges these two paths together, by moving
constant to the beginning of function.

It is possible to eliminate even more of lcall7 and lcall27
code paths, but at cost of splitting SAVE_ALL into two halves,
and I do not want to do that. But if you think that it is worth
of effort, I can save 16 more bytes, but at cost of speed.

Side effects of merge is that now stack is addressed relative
to %ebx instead of relative to %esp, so generated code is
shorter and faster.

- Use PCI_BUS_NUM_RESOURCES instead of hardcoded `4' in
  pci_find_parent_resource;
- clean up pci_claim_resource() and make it a bit more informative
  on errors;
- pdev_sort_resources() must be __devinit, as it's called from
  pbus_assign_resources_sorted(), which is __devinit now;
- fix one remaining dev->name in debugging printk.

The detection of subtractive decoding bridges is broken: `class' variable
doesn't contain ProgIf byte at this point, I should check `dev->class'
instead.

This fixes resource allocation problems on certain docking stations.

The dev_t argument of sys_mknod is passed to vfs_mknod, and is then cast
to int when foo_mknod is called, and is subsequently very often cast
back to dev_t.  (For example, minix_mknod() calls minix_set_inode() that
takes a dev_t.)

This is a cleanup that avoids this back-and-forth casting by giving
foo_mknod a prototype with dev_t.  In most cases now the dev_t is
transmitted untouched until init_special_inode.

It also makes the two routines hugetlbfs_get_inode() and
shmem_get_inode() static.

Fixes miscalculation of required module size due to alignment issues of
first section after common, and also doesn't think that no init section
is an allocation failure.

Patch from Adam Richter.  I have a nicer solution based on aliases, but
it requires coordination with USB, PCI and PCMCIA maintainers, which is
taking time.

This restores the old code in the meantime: one week without this is too
long for people who need it.

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

This removes Rules.make inclusions, makes make clean work properly,
removes EXTRA_TARGETS where not needed, and fixes a couple of compile
warnings in the boot wrappers where <linux/string.h> wasn't included.

This solves some mutual inclusion problems.

Now atomic.h defines the smp_mb__* macros completely itself without
needing the smp_mb definition from <asm/system.h>

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

Also use strsep in ibmmca.c, as strtok is gone from the kernel.

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

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

parse_interface allocates the incorrect storage size for additional
altsettings (new buffer) leading to a BUG being triggered in
mm/slab.c:1453 when we do the memcpy from the old buffer to the new
buffer (writing beyond new buffer).
Patch appended, tested with an OV511 on an Intel PIIX4