1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c	Fri Mar 18 09:05:06 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c	Fri Mar 18 09:18:26 2005 +0000
     1.3 @@ -496,21 +496,16 @@ int xlvbd_init(void)
     1.4  {
     1.5      int i;
     1.6  
     1.7 -    /*
     1.8 -     * If compiled as a module, we don't support unloading yet. We
     1.9 -     * therefore permanently increment the reference count to
    1.10 -     * disallow it.
    1.11 -     */
    1.12 -    /* MOD_INC_USE_COUNT; */
    1.13 -
    1.14      memset(major_info, 0, sizeof(major_info));
    1.15  
    1.16 -    for (i = 0; i < sizeof(major_info) / sizeof(major_info[0]); i++) {
    1.17 +    vbd_info = kmalloc(MAX_VBDS * sizeof(vdisk_t), GFP_KERNEL);
    1.18 +    if (vbd_info == NULL) {
    1.19 +        printk(KERN_ALERT "Failed to allocate memory for disk info.\n");
    1.20 +        nr_vbds = 0;
    1.21 +        return 0;
    1.22      }
    1.23  
    1.24 -    vbd_info = kmalloc(MAX_VBDS * sizeof(vdisk_t), GFP_KERNEL);
    1.25      nr_vbds  = xlvbd_get_vbd_info(vbd_info);
    1.26 -
    1.27      if (nr_vbds < 0) {
    1.28          kfree(vbd_info);
    1.29          vbd_info = NULL;