xen/blkback: Replace WRITE_BARRIER with (REQ_FLUSH | REQ_FUA)

TODO: Double check xen-blkfront.c

diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c
index 6d897664802d92257caa3c1443cbd9adc71b7a81..cb844f734d918f93cf820fcd45a97b886dd6d9bb 100644 (file)
--- a/drivers/xen/blkback/blkback.c
+++ b/drivers/xen/blkback/blkback.c
@@ -405,7 +405,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
                operation = WRITE;
                break;
        case BLKIF_OP_WRITE_BARRIER:
-               operation = WRITE_BARRIER;
+               operation = REQ_FLUSH | REQ_FUA;
                break;
        default:
                operation = 0; /* make gcc happy */
@@ -414,7 +414,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
 
        /* Check that number of segments is sane. */
        nseg = req->nr_segments;
-       if (unlikely(nseg == 0 && operation != WRITE_BARRIER) ||
+       if (unlikely(nseg == 0 && operation != (REQ_FLUSH | REQ_FUA)) ||
            unlikely(nseg > BLKIF_MAX_SEGMENTS_PER_REQUEST)) {
                DPRINTK("Bad number of segments in request (%d)\n", nseg);
                goto fail_response;
@@ -517,7 +517,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
        }
 
        if (!bio) {
-               BUG_ON(operation != WRITE_BARRIER);
+               BUG_ON(operation != (REQ_FLUSH | REQ_FUA));
                bio = bio_alloc(GFP_KERNEL, 0);
                if (unlikely(bio == NULL))
                        goto fail_put_bio;
@@ -532,7 +532,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
 
        if (operation == READ)
                blkif->st_rd_sect += preq.nr_sects;
-       else if (operation == WRITE || operation == WRITE_BARRIER)
+       else if (operation == WRITE || operation == (REQ_FLUSH | REQ_FUA))
                blkif->st_wr_sect += preq.nr_sects;
 
        return;