Skip to contentSkip to conversation

SCSI host ID assigment overoptimization removal in 2.4.18

PATCH Pete Zaitcev 1 participant 1 message Jul 20, 2002 SCSI

lore
Share & tools
lore
#0 lore raw
Quoted 6 lines
drivers/scsi/hosts.c Thu Jul 18 15:47:51 \ renamed from drivers/scsi/hosts.c Wed Jul 17 12:49:51 2002 +0 -0

2002 @@ -174,6 +186,12 @@

                 return NULL;
         }
        shn->name = kmalloc(hname_len + 1, GFP_ATOMIC);

drivers/scsi/hosts.c Thu Jul 18 15:47:51 \

Quoted 9 lines
drivers/scsi/hosts.c Thu Jul 18 15:47:51 \ renamed from drivers/scsi/hosts.c Wed Jul 17 12:49:51 2002 +6 -0
+       if (!shn->name) {
+               kfree(retval);
+               kfree(shn);
+               printk(KERN_ERR "scsi: out of memory(3) in scsi_register.\n");
+               return NULL;
+        }
        if (hname_len > 0)
            strncpy(shn->name, hname, hname_len);
        shn->name[hname_len] = 0;

Does it solve the same problem as the following? It looks like it does, only in a different place. Which one is better?

scsi/hosts.c Wed Apr 17 01:42:47 2002 renamed from scsi/hosts.c.orig Mon Feb 25 21:38:04 2002 +3 -16
@@ -81,8 +81,8 @@
 struct Scsi_Host * scsi_hostlist;
 struct Scsi_Device_Template * scsi_devicelist;
 
-int max_scsi_hosts;
-int next_scsi_host;
+int max_scsi_hosts;    /* host_no for next new host */
+int next_scsi_host;    /* count of registered scsi hosts */
 
 void
 scsi_unregister(struct Scsi_Host * sh){
@@ -107,21 +107,8 @@
     if (shn) shn->host_registered = 0;
     /* else {} : This should not happen, we should panic here... */
 
-    /* If we are removing the last host registered, it is safe to reuse
-     * its host number (this avoids "holes" at boot time) (DB)
-     * It is also safe to reuse those of numbers directly below which have
-     * been released earlier (to avoid some holes in numbering).
-     */
-    if(sh->host_no == max_scsi_hosts - 1) {
-       while(--max_scsi_hosts >= next_scsi_host) {
-           shpnt = scsi_hostlist;
-           while(shpnt && shpnt->host_no != max_scsi_hosts - 1)
-               shpnt = shpnt->next;
-           if(shpnt)
-               break;
-       }
-    }
     next_scsi_host--;
+
     kfree((char *) sh);
 }
 

See:
http://www.uwsg.indiana.edu/hypermail/linux/kernel/0206.0/1220.html

I poked Marcelo with it for Itai, and he said to wait for 2.4.20 to open. Currently we ship Itai's variant.

-- Pete