Commit 53474c04 authored Jan 22, 2008 by Tony Battersby Committed by James Bottomley Jan 23, 2008

[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>

parent 90c18f3c

drivers/scsi/sg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2529,7 +2529,7 @@ sg_idr_max_id(int id, void p, void data)
		static int
		sg_last_dev(void)
		{
		int k = 0;
		int k = -1;
		unsigned long iflags;

		read_lock_irqsave(&sg_index_lock, iflags);

Admin message