Didn't cause a merge conflict, so fixed this one up manually
post merge.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
* If it's a regular read/write or a barrier with data attached,
* go through the normal accounting stuff before submission.
*/
* If it's a regular read/write or a barrier with data attached,
* go through the normal accounting stuff before submission.
*/
- if (bio_has_data(bio) && !(rw & (1 << BIO_RW_DISCARD))) {
+ if (bio_has_data(bio) && !(rw & REQ_DISCARD)) {
if (rw & WRITE) {
count_vm_events(PGPGOUT, count);
} else {
if (rw & WRITE) {
count_vm_events(PGPGOUT, count);
} else {