ia64/xen-unstable

changeset 3808:c62ae5f347a4

bitkeeper revision 1.1192 (420d6169vOspV7vgQjqPRLjU4Xa-OQ)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
author iap10@freefall.cl.cam.ac.uk
date Sat Feb 12 01:52:41 2005 +0000 (2005-02-12)
parents d989598bb439 1204ff2a3eca
children c9a96907ffca 65043e7421e8
files linux-2.6.10-xen-sparse/drivers/xen/blkfront/block.h linux-2.6.10-xen-sparse/drivers/xen/blkfront/vbd.c
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/block.h	Sat Feb 12 01:38:49 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/block.h	Sat Feb 12 01:52:41 2005 +0000
     1.3 @@ -5,7 +5,7 @@
     1.4   * 
     1.5   * Copyright (c) 2003-2004, Keir Fraser & Steve Hand
     1.6   * Modifications by Mark A. Williamson are (c) Intel Research Cambridge
     1.7 - * Copyright (c) 2004, Christian Limpach
     1.8 + * Copyright (c) 2004-2005, Christian Limpach
     1.9   * 
    1.10   * This file may be distributed separately from the Linux kernel, or
    1.11   * incorporated into other software packages, subject to the following license:
    1.12 @@ -69,7 +69,8 @@ struct xlbd_type_info {
    1.13      int devs_per_major;
    1.14      int hardsect_size;
    1.15      int max_sectors;
    1.16 -    char *name;
    1.17 +    char *devname;
    1.18 +    char *diskname;
    1.19  };
    1.20  
    1.21  /*
     2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/vbd.c	Sat Feb 12 01:38:49 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/vbd.c	Sat Feb 12 01:52:41 2005 +0000
     2.3 @@ -5,7 +5,7 @@
     2.4   * 
     2.5   * Copyright (c) 2003-2004, Keir Fraser & Steve Hand
     2.6   * Modifications by Mark A. Williamson are (c) Intel Research Cambridge
     2.7 - * Copyright (c) 2004, Christian Limpach
     2.8 + * Copyright (c) 2004-2005, Christian Limpach
     2.9   * 
    2.10   * This file may be distributed separately from the Linux kernel, or
    2.11   * incorporated into other software packages, subject to the following license:
    2.12 @@ -49,7 +49,8 @@ static struct xlbd_type_info xlbd_ide_ty
    2.13      .hardsect_size = 512,
    2.14      .max_sectors = 128,  /* 'hwif->rqsize' if we knew it */
    2.15      // XXXcl todo read_ahead[major]    = 8; /* from drivers/ide/ide-probe.c */
    2.16 -    .name = "hd",
    2.17 +    .devname = "ide",
    2.18 +    .diskname = "hd",
    2.19  };
    2.20  
    2.21  static struct xlbd_type_info xlbd_scsi_type = {
    2.22 @@ -59,7 +60,8 @@ static struct xlbd_type_info xlbd_scsi_t
    2.23      .hardsect_size = 512,
    2.24      .max_sectors = 128*8, /* XXX 128; */
    2.25      // XXXcl todo read_ahead[major]    = 0; /* XXX 8; -- guessing */
    2.26 -    .name = "sd",
    2.27 +    .devname = "sd",
    2.28 +    .diskname = "sd",
    2.29  };
    2.30  
    2.31  static struct xlbd_type_info xlbd_vbd_type = {
    2.32 @@ -69,7 +71,8 @@ static struct xlbd_type_info xlbd_vbd_ty
    2.33      .hardsect_size = 512,
    2.34      .max_sectors = 128,
    2.35      // XXXcl todo read_ahead[major]    = 8;
    2.36 -    .name = "xvd",
    2.37 +    .devname = "xvd",
    2.38 +    .diskname = "xvd",
    2.39  };
    2.40  
    2.41  static struct xlbd_major_info *major_info[NUM_IDE_MAJORS + NUM_SCSI_MAJORS +
    2.42 @@ -183,13 +186,13 @@ static struct xlbd_major_info *xlbd_get_
    2.43      }
    2.44      major_info[mi_idx]->major = new_major;
    2.45  
    2.46 -    if (register_blkdev(major_info[mi_idx]->major, major_info[mi_idx]->type->name)) {
    2.47 +    if (register_blkdev(major_info[mi_idx]->major, major_info[mi_idx]->type->devname)) {
    2.48          printk(KERN_ALERT "XL VBD: can't get major %d with name %s\n",
    2.49 -               major_info[mi_idx]->major, major_info[mi_idx]->type->name);
    2.50 +               major_info[mi_idx]->major, major_info[mi_idx]->type->devname);
    2.51          goto out;
    2.52      }
    2.53  
    2.54 -    devfs_mk_dir(major_info[mi_idx]->type->name);
    2.55 +    devfs_mk_dir(major_info[mi_idx]->type->devname);
    2.56  
    2.57      return major_info[mi_idx];
    2.58  
    2.59 @@ -226,7 +229,7 @@ static struct gendisk *xlvbd_get_gendisk
    2.60      gd->first_minor = xd_minor;
    2.61      gd->fops = &xlvbd_block_fops;
    2.62      gd->private_data = di;
    2.63 -    sprintf(gd->disk_name, "%s%c%d", mi->type->name,
    2.64 +    sprintf(gd->disk_name, "%s%c%d", mi->type->diskname,
    2.65              'a' + mi->index * mi->type->partn_per_major +
    2.66              (xd_minor >> mi->type->partn_shift),
    2.67              xd_minor & ((1 << mi->type->partn_shift) - 1));