Merge ath-next from ath.git

[mirror_ubuntu-bionic-kernel.git] / drivers / block / xen-blkfront.c

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 2236c6f31608977f13b284cdec3b06e164ab632a..37779e4c4585eaeeebdb801229291041b8fc7103 100644 (file)
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1391,7 +1391,7 @@ static int blkfront_probe(struct xenbus_device *dev,
                        if (major != XENVBD_MAJOR) {
                                printk(KERN_INFO
                                                "%s: HVM does not support vbd %d as xen block device\n",
-                                               __FUNCTION__, vdevice);
+                                               __func__, vdevice);
                                return -ENODEV;
                        }
                }
@@ -1511,7 +1511,7 @@ static int blkif_recover(struct blkfront_info *info)
                merge_bio.tail = copy[i].request->biotail;
                bio_list_merge(&bio_list, &merge_bio);
                copy[i].request->bio = NULL;
-               blk_put_request(copy[i].request);
+               blk_end_request_all(copy[i].request, 0);
        }
 
        kfree(copy);
@@ -1534,7 +1534,7 @@ static int blkif_recover(struct blkfront_info *info)
                req->bio = NULL;
                if (req->cmd_flags & (REQ_FLUSH | REQ_FUA))
                        pr_alert("diskcache flush request found!\n");
-               __blk_put_request(info->rq, req);
+               __blk_end_request_all(req, 0);
        }
        spin_unlock_irq(&info->io_lock);