UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

skd: Rework request failing code path 

Move the skd_fail_all_pending() call out of skd_request_fn_not_online()
such that this function can be reused in the blk-mq code path.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche 2017-08-17 13:13:21 -07:00 committed by Jens Axboe
parent cb6981b9a3
commit 3d17a679d3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/block/skd_main.c
View File

@ -506,7 +506,10 @@ skd_prep_zerosize_flush_cdb(struct skd_scsi_request *scsi_req,
scsi_req->cdb[9] = 0; scsi_req->cdb[9] = 0;
} }
static void skd_request_fn_not_online(struct request_queue *q) /*
* Return true if and only if all pending requests should be failed.
*/
static bool skd_fail_all(struct request_queue *q)
{ {
struct skd_device *skdev = q->queuedata; struct skd_device *skdev = q->queuedata;
@ -530,7 +533,7 @@ static void skd_request_fn_not_online(struct request_queue *q)
case SKD_DRVR_STATE_BUSY_IMMINENT: case SKD_DRVR_STATE_BUSY_IMMINENT:
case SKD_DRVR_STATE_BUSY_ERASE: case SKD_DRVR_STATE_BUSY_ERASE:
case SKD_DRVR_STATE_DRAINING_TIMEOUT: case SKD_DRVR_STATE_DRAINING_TIMEOUT:
return; return false;
case SKD_DRVR_STATE_BUSY_SANITIZE: case SKD_DRVR_STATE_BUSY_SANITIZE:
case SKD_DRVR_STATE_STOPPING: case SKD_DRVR_STATE_STOPPING:
@ -538,14 +541,8 @@ static void skd_request_fn_not_online(struct request_queue *q)
case SKD_DRVR_STATE_FAULT: case SKD_DRVR_STATE_FAULT:
case SKD_DRVR_STATE_DISAPPEARED: case SKD_DRVR_STATE_DISAPPEARED:
default: default:
break; return true;
} }
/* If we get here, terminate all pending block requeusts
* with EIO and any scsi pass thru with appropriate sense
*/
skd_fail_all_pending(skdev);
} }
static void skd_request_fn(struct request_queue *q) static void skd_request_fn(struct request_queue *q)
@ -566,7 +563,8 @@ static void skd_request_fn(struct request_queue *q)
int flush, fua; int flush, fua;
if (skdev->state != SKD_DRVR_STATE_ONLINE) { if (skdev->state != SKD_DRVR_STATE_ONLINE) {
skd_request_fn_not_online(q); if (skd_fail_all(q))
skd_fail_all_pending(skdev);
return; return;
} }