Merge branch 'for-3.20/core' into for-3.20/drivers

We need the tagging changes for the libata conversion.

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index d169b4a79267..cee20354ac37 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1388,7 +1388,7 @@ int drbd_submit_peer_request(struct drbd_device *device,
                 list_add_tail(&peer_req->w.list, &device->active_ee);
                 spin_unlock_irq(&device->resource->req_lock);
                 if (blkdev_issue_zeroout(device->ldev->backing_bdev,
-                        sector, data_size >> 9, GFP_NOIO))
+                        sector, data_size >> 9, GFP_NOIO, false))
                         peer_req->flags |= EE_WAS_ERROR;
                 drbd_endio_write_sec_final(peer_req);
                 return 0;
diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index 79aa179305b5..e22942596207 100644
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -423,7 +423,7 @@ static int osdblk_init_disk(struct osdblk_device *osdev)
         }
 
         /* switch queue to TCQ mode; allocate tag map */
-        rc = blk_queue_init_tags(q, OSDBLK_MAX_REQ, NULL);
+        rc = blk_queue_init_tags(q, OSDBLK_MAX_REQ, NULL, BLK_TAG_ALLOC_FIFO);
         if (rc) {
                 blk_cleanup_queue(q);
                 put_disk(disk);