hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390: fix up for "blk-mq: switch ->queue_rq return value to blk_status_t" 

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Stephen Rothwell 2017-07-04 17:58:18 +10:00 committed by Martin Schwidefsky
parent 19964541c2
commit dd1023c89e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/s390/block/scm_blk.c
View File

@ -278,7 +278,7 @@ struct scm_queue {
spinlock_t lock; spinlock_t lock;
}; };
static int scm_blk_request(struct blk_mq_hw_ctx *hctx, static blk_status_t scm_blk_request(struct blk_mq_hw_ctx *hctx,
const struct blk_mq_queue_data *qd) const struct blk_mq_queue_data *qd)
{ {
struct scm_device *scmdev = hctx->queue->queuedata; struct scm_device *scmdev = hctx->queue->queuedata;
@ -290,7 +290,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
spin_lock(&sq->lock); spin_lock(&sq->lock);
if (!scm_permit_request(bdev, req)) { if (!scm_permit_request(bdev, req)) {
spin_unlock(&sq->lock); spin_unlock(&sq->lock);
return BLK_MQ_RQ_QUEUE_BUSY; return BLK_STS_RESOURCE;
} }
scmrq = sq->scmrq; scmrq = sq->scmrq;
@ -299,7 +299,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
if (!scmrq) { if (!scmrq) {
SCM_LOG(5, "no request"); SCM_LOG(5, "no request");
spin_unlock(&sq->lock); spin_unlock(&sq->lock);
return BLK_MQ_RQ_QUEUE_BUSY; return BLK_STS_RESOURCE;
} }
scm_request_init(bdev, scmrq); scm_request_init(bdev, scmrq);
sq->scmrq = scmrq; sq->scmrq = scmrq;
@ -315,7 +315,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
sq->scmrq = NULL; sq->scmrq = NULL;
spin_unlock(&sq->lock); spin_unlock(&sq->lock);
return BLK_MQ_RQ_QUEUE_BUSY; return BLK_STS_RESOURCE;
} }
blk_mq_start_request(req); blk_mq_start_request(req);
@ -324,7 +324,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx,
sq->scmrq = NULL; sq->scmrq = NULL;
} }
spin_unlock(&sq->lock); spin_unlock(&sq->lock);
return BLK_MQ_RQ_QUEUE_OK; return BLK_STS_OK;
} }
static int scm_blk_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, static int scm_blk_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,