"Fossies" - the Fresh Open Source Software Archive

Member "aoe-aoe6-86/conf/29-patches/old-new.diff" (4 Jul 2015, 679 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 a57316a..677584e 100644
    3 --- a/linux/drivers/block/aoe/aoeblk.c
    4 +++ b/linux/drivers/block/aoe/aoeblk.c
    5 @@ -278,14 +278,14 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
    6  }
    7  
    8  static int
    9 -aoeblk_ioctl(struct inode *inode, struct file *filp, uint cmd, ulong arg)
   10 +aoeblk_ioctl(struct block_device *bdev, fmode_t mode, uint cmd, ulong arg)
   11  {
   12     struct aoedev *d;
   13  
   14     if (!arg)
   15         return -EINVAL;
   16  
   17 -   d = inode->i_bdev->bd_disk->private_data;
   18 +   d = bdev->bd_disk->private_data;
   19     if ((d->flags & DEVFL_UP) == 0) {
   20         printk(KERN_ERR "aoe: disk not up\n");
   21         return -ENODEV;