From: Andrew Morton Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/s390/block/dasd_diag.c | 2 +- drivers/s390/block/dasd_fba.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/s390/block/dasd_diag.c~git-block-dasd-fix-2 drivers/s390/block/dasd_diag.c --- a/drivers/s390/block/dasd_diag.c~git-block-dasd-fix-2 +++ a/drivers/s390/block/dasd_diag.c @@ -547,7 +547,7 @@ dasd_diag_build_cp(struct dasd_device * } cqr->retries = DIAG_MAX_RETRIES; cqr->buildclk = get_clock(); - if (req->flags & REQ_FAILFAST) + if (req->cmd_flags & REQ_FAILFAST) set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags); cqr->device = device; cqr->expires = DIAG_TIMEOUT; diff -puN drivers/s390/block/dasd_fba.c~git-block-dasd-fix-2 drivers/s390/block/dasd_fba.c --- a/drivers/s390/block/dasd_fba.c~git-block-dasd-fix-2 +++ a/drivers/s390/block/dasd_fba.c @@ -344,7 +344,7 @@ dasd_fba_build_cp(struct dasd_device * d recid++; } } - if (req->flags & REQ_FAILFAST) + if (req->cmd_flags & REQ_FAILFAST) set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags); cqr->device = device; cqr->expires = 5 * 60 * HZ; /* 5 minutes */ _