Commit 53474c042c0e1be39557474c945ad4a8e653ad46

Authored by Tony Battersby
Committed by James Bottomley
1 parent 90c18f3c28

[SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices

The patch "[SCSI] sg: use idr to replace static arrays" in 2.6.24-rc1
causes a bogus line to appear in /proc/scsi/sg/devices containing
"-1 -1 -1 -1 -1 -1 -1 -1 -1" when there are no SCSI devices in the
system.  In 2.6.23, /proc/scsi/sg/devices is empty when there are no
SCSI devices in the system.  A similar problem exists with
/proc/scsi/sg/device_strs.  The following patch restores the behavior
of 2.6.23.

Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Acked-by: Douglas Gilbert <dougg@torque.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -2529,7 +2529,7 @@
2529 2529 static int
2530 2530 sg_last_dev(void)
2531 2531 {
2532   - int k = 0;
  2532 + int k = -1;
2533 2533 unsigned long iflags;
2534 2534  
2535 2535 read_lock_irqsave(&sg_index_lock, iflags);