"Fossies" - the Fresh Open Source Software Archive

Member "aoe-aoe6-86/conf/28-patches/old-new.diff" (4 Jul 2015, 987 Bytes) of archive /linux/misc/aoe-aoe6-86.tar.gz:


As a special service "Fossies" has tried to format the requested source page into HTML format using (guessed) Diff source code syntax highlighting (style: standard) with prefixed line numbers. Alternatively you can here view or download the uninterpreted source code file.

    1 diff --git a/linux/drivers/block/aoe/aoeblk.c b/linux/drivers/block/aoe/aoeblk.c
    2 index 9e196f7..18146b8 100644
    3 --- a/linux/drivers/block/aoe/aoeblk.c
    4 +++ b/linux/drivers/block/aoe/aoeblk.c
    5 @@ -199,12 +199,11 @@ aoedisk_rm_sysfs(struct aoedev *d)
    6  }
    7  
    8  static int
    9 -aoeblk_open(struct inode *inode, struct file *filp)
   10 +aoeblk_open(struct block_device *bdev, fmode_t mode)
   11  {
   12 -   struct aoedev *d;
   13 +   struct aoedev *d = bdev->bd_disk->private_data;
   14     ulong flags;
   15  
   16 -   d = inode->i_bdev->bd_disk->private_data;
   17     if (!virt_addr_valid(d)) {
   18         printk(KERN_CRIT
   19             "aoe: invalid device pointer in %s\n",
   20 @@ -226,13 +225,11 @@ aoeblk_open(struct inode *inode, struct file *filp)
   21  }
   22  
   23  static int
   24 -aoeblk_release(struct inode *inode, struct file *filp)
   25 +aoeblk_release(struct gendisk *disk, fmode_t mode)
   26  {
   27 -   struct aoedev *d;
   28 +   struct aoedev *d = disk->private_data;
   29     ulong flags;
   30  
   31 -   d = inode->i_bdev->bd_disk->private_data;
   32 -
   33     spin_lock_irqsave(&d->lock, flags);
   34  
   35     if (--d->nopen == 0) {