patch-1.3.47 linux/drivers/scsi/sd.c

Next file: linux/fs/proc/mem.c
Previous file: linux/drivers/scsi/scsi_syms.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.46/linux/drivers/scsi/sd.c linux/drivers/scsi/sd.c
@@ -1304,12 +1304,14 @@
 	if (!rscsi_disks[i].capacity && 
 	    rscsi_disks[i].device)
 	{
-	    i = sd_init_onedisk(i);
 	    if (MODULE_FLAG
 		&& !rscsi_disks[i].has_part_table) {
 		sd_sizes[i << 4] = rscsi_disks[i].capacity;
+		/* revalidate does sd_init_onedisk via MAYBE_REINIT*/
 		revalidate_scsidisk(MKDEV(MAJOR_NR, i << 4), 0);
 	    }
+	    else
+	    	i=sd_init_onedisk(i);
 	    rscsi_disks[i].has_part_table = 1;
 	}
     

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this