ia64/xen-unstable

changeset 4432:7535a4b0ae76

bitkeeper revision 1.1236.1.191 (424d7be0e1YspeLAWBWse044dLabag)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/xen-unstable.bk
author vh249@arcadians.cl.cam.ac.uk
date Fri Apr 01 16:50:40 2005 +0000 (2005-04-01)
parents 344290c77cab e89596d1bfb4
children 8c365db41887
files linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c	Fri Apr 01 16:32:25 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c	Fri Apr 01 16:50:40 2005 +0000
     1.3 @@ -226,8 +226,7 @@ int blkif_release(struct inode *inode, s
     1.4  int blkif_ioctl(struct inode *inode, struct file *filep,
     1.5                  unsigned command, unsigned long argument)
     1.6  {
     1.7 -	int i;
     1.8 -    /*  struct gendisk *gd = inode->i_bdev->bd_disk; */
     1.9 +    int i;
    1.10  
    1.11      DPRINTK_IOCTL("command: 0x%x, argument: 0x%lx, dev: 0x%04x\n",
    1.12                    command, (long)argument, inode->i_rdev); 
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c	Fri Apr 01 16:32:25 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c	Fri Apr 01 16:50:40 2005 +0000
     2.3 @@ -338,8 +338,6 @@ static int xlvbd_device_add(struct list_
     2.4      if ( !bd )
     2.5          goto out;
     2.6      
     2.7 -    down(&bd->bd_sem);
     2.8 -
     2.9      gd = xlvbd_alloc_gendisk(mi, minor, disk);
    2.10      if ( !gd )
    2.11          goto out_bd;
    2.12 @@ -365,7 +363,6 @@ static int xlvbd_device_add(struct list_
    2.13  
    2.14      list_add(&new->list, list);
    2.15  out_bd:
    2.16 -    up(&bd->bd_sem);
    2.17      bdput(bd);
    2.18  out:
    2.19      return 0;
    2.20 @@ -385,8 +382,6 @@ static int xlvbd_device_del(struct lvdis
    2.21      if ( !bd )
    2.22          return -1;
    2.23  
    2.24 -    down(&bd->bd_sem);
    2.25 -
    2.26      gd = get_gendisk(device, &unused);
    2.27      di = gd->private_data;
    2.28  
    2.29 @@ -400,7 +395,6 @@ static int xlvbd_device_del(struct lvdis
    2.30  
    2.31      xlvbd_device_free(disk);
    2.32  out:
    2.33 -    up(&bd->bd_sem);
    2.34      bdput(bd);
    2.35      return ret;
    2.36  }
    2.37 @@ -421,13 +415,10 @@ static int xlvbd_device_update(struct lv
    2.38      if ( !bd )
    2.39          return -1;
    2.40  
    2.41 -    down(&bd->bd_sem);
    2.42 -
    2.43      gd = get_gendisk(device, &unused);
    2.44      set_capacity(gd, disk->capacity);    
    2.45      ldisk->capacity = disk->capacity;
    2.46  
    2.47 -    up(&bd->bd_sem);
    2.48      bdput(bd);
    2.49  
    2.50      return 0;