linux.git/block, branch v2.6.27-rc4

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

2008-08-05T00:19:18+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] scsi_transport_spi: fix oops in revalidate
  [SCSI] ses: fix VPD inquiry overrun
  [SCSI] block: Fix miscalculation of sg_io timeout in CDROM_SEND_PACKET handler.
  [SCSI] hptiop: add more PCI device IDs

block: add a blk_plug_device_unlocked() that grabs the queue lock

2008-08-01T18:31:32+00:00

blk_plug_device() must be called with the queue lock held, so callers
often just grab and release the lock for that purpose. Add a helper
that does just that.

Signed-off-by: Jens Axboe

[SCSI] block: Fix miscalculation of sg_io timeout in CDROM_SEND_PACKET handler.

2008-07-30T15:18:29+00:00

It seems cdrwtool in the udftools has been unusable on "modern" kernels
for some time. A Google search reveals many people with the same issue
but no solution (cdrwtool fails to format the disk). After spending some
time tracking down the issue, it comes down to the following:

The udftools still use the older CDROM_SEND_PACKET interface to send
things like FORMAT_UNIT through to the drive. They should really be
updated, but that's another story. Since most distros are using libata
now, the cd or dvd burner appears as a SCSI device, and we wind up in
block/scsi_ioctl.c. Here, the code tries to take the "struct
cdrom_generic_command" and translate it and stuff it into a "struct
sg_io_hdr" structure so it can pass it to the modern sg_io() routine
instead. Unfortunately, there is one error, or rather an omission in the
translation. The timeout that is passed in in the "struct
cdrom_generic_command" is in HZ=100 units, and this is modified and
correctly converted to jiffies by use of clock_t_to_jiffies(). However,
a little further down, this cgc.timeout value in jiffies is simply
copied into the sg_io_hdr timeout, which should be in milliseconds.
Since most modern x86 kernels seems to be getting build with HZ=250, the
timeout that is passed to sg_io and eventually converted to the
timeout_per_command member of the scsi_cmnd structure is now four times
too small. Since cdrwtool tries to set the timeout to one hour for the
FORMAT_UNIT command, and it takes about 20 minutes to format a 4x CDRW,
the SCSI error-handler kicks in after the FORMAT_UNIT completes because
it took longer than the incorrectly-calculated timeout.

[jejb: fix up whitespace]
Signed-off-by: Tim Wright 
Cc: Stable Tree 
Signed-off-by: James Bottomley

Use WARN() in block/

2008-07-26T19:00:07+00:00

Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.

Signed-off-by: Arjan van de Ven 
Cc: Jens Axboe 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

block/blk-map.c: use the new object_is_on_stack() helper

2008-07-26T19:00:02+00:00

Signed-off-by: FUJITA Tomonori 
Cc: Bartlomiej Zolnierkiewicz 
Cc: Thomas Bogendoerfer 
Cc: Tejun Heo 
Cc: Jens Axboe 
Cc: James Bottomley 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

block/ioctl.c and fs/partition/check.c: check value returned by add_partition()

2008-07-25T17:53:44+00:00

Now that add_partition() has been aught to propagate errors, let's check them.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Abdel Benamrouche 
Cc: Jens Axboe 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

block: make /proc/partitions and /proc/diskstats use class_find_device()

2008-07-22T04:54:49+00:00

Use the proper class iterator function instead of mucking around in the
internals of the class structures.

Cc: Kay Sievers 
Signed-off-by: Greg Kroah-Hartman

block: move header for /proc/partitions to seq_start

2008-07-22T04:54:49+00:00

The seq_start call is the better place for the header for the file, that
way we don't have to be mucking in the class structure to try to figure
out if this is the first partition or not.

Cc: Kay Sievers 
Signed-off-by: Greg Kroah-Hartman

block: make proc files seq_start use the class_find_device()

2008-07-22T04:54:49+00:00

Use the proper class iterator function instead of mucking around in the
internals of the class structures.

Cc: Kay Sievers 
Signed-off-by: Greg Kroah-Hartman

block: make /proc/diskstats only build if CONFIG_PROC_FS is enabled

2008-07-22T04:54:49+00:00

These functions are only needed if CONFIG_PROC_FS is enabled, so save
the space when it is not.

This also makes it easier for a patch later in this series to work
properly if CONFIG_PROC_FS is not enabled.

Signed-off-by: Randy Dunlap 
Signed-off-by: Greg Kroah-Hartman