"Fossies" - the Fresh Open Source Software Archive

Member "aoe-aoe6-86/conf/30-patches/old-new.diff" (4 Jul 2015, 2148 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 commit 077517992e7cb7e0b4407fb9cb3bbcf01f3d36e2
    2 Author: Ed Cashin <ecashin@coraid.com>
    3 Date:   Mon Jul 20 14:19:06 2009 -0400
    4 
    5     include ata.h and use ATA_CMD_PIO_* instead of WIN_*
    6     
    7     based on 04b3ab52a000ab7e718efc97e9fdd67d95002d11
    8     Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    9     Date:   Wed Apr 1 21:42:24 2009 +0200
   10     
   11         aoe: WIN_* -> ATA_CMD_*
   12     
   13         * Use ATA_CMD_* defines instead of WIN_* ones.
   14     
   15         * Include <linux/ata.h> directly instead of through <linux/hdreg.h>.
   16     
   17         Cc: Ed L. Cashin <ecashin@coraid.com>
   18         Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
   19 
   20 diff --git a/linux/drivers/block/aoe/aoecmd.c b/linux/drivers/block/aoe/aoecmd.c
   21 index 741dd82..d188b5b 100644
   22 --- a/linux/drivers/block/aoe/aoecmd.c
   23 +++ b/linux/drivers/block/aoe/aoecmd.c
   24 @@ -4,6 +4,7 @@
   25   * Filesystem request handling methods
   26   */
   27  
   28 +#include <linux/ata.h>
   29  #include <linux/hdreg.h>
   30  #include <linux/blkdev.h>
   31  #include <linux/skbuff.h>
   32 @@ -377,7 +378,7 @@ ata_rw_frameinit(struct frame *f)
   33         writebit = 0;
   34     }
   35  
   36 -   ah->cmdstat = WIN_READ | writebit | extbit;
   37 +   ah->cmdstat = ATA_CMD_PIO_READ | writebit | extbit;
   38     skb->dev = t->ifp->nd;
   39  }
   40  
   41 @@ -1182,8 +1183,8 @@ noskb:        if (buf)
   42  
   43     n = ahout->scnt << 9;
   44     switch (ahout->cmdstat) {
   45 -   case WIN_READ:
   46 -   case WIN_READ_EXT:
   47 +   case ATA_CMD_PIO_READ:
   48 +   case ATA_CMD_PIO_READ_EXT:
   49         if (skb->len < n) {
   50             printk(KERN_ERR
   51                 "aoe: runt data size in read from e%ld.%d."
   52 @@ -1194,15 +1195,15 @@ noskb:      if (buf)
   53             break;
   54         }
   55         bvcpy(f->bv, f->bv_off, skb, n);
   56 -   case WIN_WRITE:
   57 -   case WIN_WRITE_EXT:
   58 +   case ATA_CMD_PIO_WRITE:
   59 +   case ATA_CMD_PIO_WRITE_EXT:
   60         spin_lock_irq(&d->lock);
   61         ifp = getif(t, skb->dev);
   62         if (ifp)
   63             ifp->lost = 0;
   64         spin_unlock_irq(&d->lock);
   65         break;
   66 -   case WIN_IDENTIFY:
   67 +   case ATA_CMD_ID_ATA:
   68         if (skb->len < 512) {
   69             printk(KERN_INFO
   70                 "aoe: runt data size in ataid from e%ld.%d."
   71 @@ -1425,7 +1426,7 @@ aoecmd_ata_id(struct aoedev *d)
   72  
   73     /* set up ata header */
   74     ah->scnt = 1;
   75 -   ah->cmdstat = WIN_IDENTIFY;
   76 +   ah->cmdstat = ATA_CMD_ID_ATA;
   77     ah->lba3 = 0xa0;
   78  
   79     skb->dev = t->ifp->nd;