evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
TODO: Double check xen-blkfront.c
This commit is contained in:
Konrad Rzeszutek Wilk 2011-02-24 17:22:41 -05:00
parent 313d7b003c
commit 248e9f7539
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/xen/blkback/blkback.c
View file

@ -405,7 +405,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
operation = WRITE; operation = WRITE;
break; break;
case BLKIF_OP_WRITE_BARRIER: case BLKIF_OP_WRITE_BARRIER:
operation = WRITE_BARRIER; operation = REQ_FLUSH | REQ_FUA;
break; break;
default: default:
operation = 0; /* make gcc happy */ 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. */ /* Check that number of segments is sane. */
nseg = req->nr_segments; 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)) { unlikely(nseg > BLKIF_MAX_SEGMENTS_PER_REQUEST)) {
DPRINTK("Bad number of segments in request (%d)\n", nseg); DPRINTK("Bad number of segments in request (%d)\n", nseg);
goto fail_response; goto fail_response;
@ -517,7 +517,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
} }
if (!bio) { if (!bio) {
BUG_ON(operation != WRITE_BARRIER); BUG_ON(operation != (REQ_FLUSH | REQ_FUA));
bio = bio_alloc(GFP_KERNEL, 0); bio = bio_alloc(GFP_KERNEL, 0);
if (unlikely(bio == NULL)) if (unlikely(bio == NULL))
goto fail_put_bio; goto fail_put_bio;
@ -532,7 +532,7 @@ static void dispatch_rw_block_io(blkif_t *blkif,
if (operation == READ) if (operation == READ)
blkif->st_rd_sect += preq.nr_sects; 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; blkif->st_wr_sect += preq.nr_sects;
return; return;