"Fossies" - the Fresh Open Source Software Archive

Member "aoe-aoe6-86/conf/31-patches/old-new.diff" (4 Jul 2015, 1570 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 7323084..b7a6b01 100644
    3 --- a/linux/drivers/block/aoe/aoeblk.c
    4 +++ b/linux/drivers/block/aoe/aoeblk.c
    5 @@ -252,8 +252,8 @@ aoeblk_request(struct request_queue *q)
    6     if ((d->flags & DEVFL_UP) == 0) {
    7         printk(KERN_INFO "aoe: device %ld.%d is not up\n",
    8             d->aoemajor, d->aoeminor);
    9 -       while ((rq=elv_next_request(q))) {
   10 -           blkdev_dequeue_request(rq);
   11 +       while ((rq = blk_peek_request(q))) {
   12 +           blk_start_request(rq);
   13             aoe_end_request(d, rq, 1);
   14         }
   15         return;
   16 diff --git a/linux/drivers/block/aoe/aoecmd.c b/linux/drivers/block/aoe/aoecmd.c
   17 index d188b5b..4ec5536 100644
   18 --- a/linux/drivers/block/aoe/aoecmd.c
   19 +++ b/linux/drivers/block/aoe/aoecmd.c
   20 @@ -909,10 +909,10 @@ nextbuf(struct aoedev *d)
   21         return d->ip.buf;
   22     rq = d->ip.rq;
   23     if (rq == NULL) {
   24 -       rq = elv_next_request(q);
   25 +       rq = blk_peek_request(q);
   26         if (rq == NULL)
   27             return NULL;
   28 -       blkdev_dequeue_request(rq);
   29 +       blk_start_request(rq);
   30         d->ip.rq = rq;
   31         d->ip.nxbio = rq->bio;
   32         rq->special = (void *) rqbiocnt(rq);
   33 diff --git a/linux/drivers/block/aoe/aoedev.c b/linux/drivers/block/aoe/aoedev.c
   34 index 8466628..d02ecb7 100644
   35 --- a/linux/drivers/block/aoe/aoedev.c
   36 +++ b/linux/drivers/block/aoe/aoedev.c
   37 @@ -227,8 +227,8 @@ aoedev_downdev(struct aoedev *d)
   38  
   39     /* fast fail all pending I/O */
   40     if (d->blkq) {
   41 -       while ((rq = elv_next_request(d->blkq))) {
   42 -           blkdev_dequeue_request(rq);
   43 +       while ((rq = blk_peek_request(d->blkq))) {
   44 +           blk_start_request(rq);
   45             aoe_end_request(d, rq, 1);
   46         }
   47     }