linux-toradex.git/drivers/block, branch v2.6.32-rc3

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

2009-10-04T19:39:14+00:00

* 'for-linus' of git://git.kernel.dk/linux-2.6-block: (41 commits)
  Revert "Seperate read and write statistics of in_flight requests"
  cfq-iosched: don't delay async queue if it hasn't dispatched at all
  block: Topology ioctls
  cfq-iosched: use assigned slice sync value, not default
  cfq-iosched: rename 'desktop' sysfs entry to 'low_latency'
  cfq-iosched: implement slower async initiate and queue ramp up
  cfq-iosched: delay async IO dispatch, if sync IO was just done
  cfq-iosched: add a knob for desktop interactiveness
  Add a tracepoint for block request remapping
  block: allow large discard requests
  block: use normal I/O path for discard requests
  swapfile: avoid NULL pointer dereference in swapon when s_bdev is NULL
  fs/bio.c: move EXPORT* macros to line after function
  Add missing blk_trace_remove_sysfs to be in pair with blk_trace_init_sysfs
  cciss: fix build when !PROC_FS
  block: Do not clamp max_hw_sectors for stacking devices
  block: Set max_sectors correctly for stacking devices
  cciss: cciss_host_attr_groups should be const
  cciss: Dynamically allocate the drive_info_struct for each logical drive.
  cciss: Add usage_count attribute to each logical drive in /sys
  ...

const: constify remaining file_operations

2009-10-01T23:11:11+00:00

[akpm@linux-foundation.org: fix KVM]
Signed-off-by: Alexey Dobriyan 
Acked-by: Mike Frysinger 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

cciss: fix build when !PROC_FS

2009-10-01T19:15:45+00:00

Fix these build errors when CONFIG_PROC_FS is not set:
drivers/block/cciss.c: In function 'cciss_show_raid_level':
drivers/block/cciss.c:623: error: 'RAID_UNKNOWN' undeclared (first use in this function)
drivers/block/cciss.c:626: error: 'raid_label' undeclared (first use in this function)
drivers/block/cciss.c: In function 'cciss_geometry_inquiry':
drivers/block/cciss.c:2696: error: 'RAID_UNKNOWN' undeclared (first use in this function)

Signed-off-by: Alexander Beregalov 
Signed-off-by: Jens Axboe

cciss: cciss_host_attr_groups should be const

2009-10-01T19:15:45+00:00

Signed-off-by: Jens Axboe

cciss: Dynamically allocate the drive_info_struct for each logical drive.

2009-10-01T19:15:45+00:00

cciss: Dynamically allocate the drive_info_struct for each logical drive.
This reduces the size of the per-hba ctlr_info structure from 106936
bytes to 8132 bytes.  That's on 32-bit systems.  On 64-bit systems, the
improvement is even bigger.  Without this, the ctlr_info struct is so big
that the driver won't even load on a 64 bit system if CISS_MAX_LUN was
at it's current setting of 1024 logical drives.

Signed-off-by: Stephen M. Cameron 
Signed-off-by: Jens Axboe

cciss: Add usage_count attribute to each logical drive in /sys

2009-10-01T19:15:44+00:00

Add usage_count attribute to each logical drive at
/sys/devices//ccissX/cXdY/usage_count for controller X,
logical drive Y.  The usage count is the number of times
the device has currently been opened.

Signed-off-by: Stephen M. Cameron 
Signed-off-by: Jens Axboe

cciss: Add a "raid_level" attribute to each logical drive in /sys

2009-10-01T19:15:44+00:00

and change get rid of some magic numbers in raid lavel decoding.

Add raid_level attribute to each logical drive at
/sys/devices//ccissX/cXdY/raid_level for controller X,
logical drive Y

Signed-off-by: Stephen M. Cameron 
Signed-off-by: Jens Axboe

cciss: fix some magic numbers in the raid-level decoding

2009-10-01T19:15:44+00:00

cciss: fix some magic numbers in the raid-level decoding

Signed-off-by: Stephen M. Cameron 
Signed-off-by: Jens Axboe

cciss: Add lunid attribute to each logical drive in /sys

2009-10-01T19:15:44+00:00

Add lunid attribute to each logical drive at
/sys/devices//ccissX/cXdY/lunid for controller X,
logical drive Y

Signed-off-by: Stephen M. Cameron 
Signed-off-by: Jens Axboe

cciss: Don't check h->busy_initializing in cciss_open().

2009-10-01T19:15:43+00:00

Don't check h->busy_initializing in cciss_open().  Open won't be
called before things are ready, but h->busy_initializing won't be
unset until after the initial rebuild_lun_table is finished.  But,
to read the partitions, cciss_open will be called for each logical
drive during rebuild_lun_table.  If cciss_open checks h->busy_initializing,
then the reading of the partition information during the initial
rebuild_lun_table will fail, which is especially bad news if it
happens to be your boot device.

Signed-off-by: Stephen M. Cameron 
Signed-off-by: Jens Axboe