diff options
Diffstat (limited to 's390-fix.patch')
| -rw-r--r-- | s390-fix.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/s390-fix.patch b/s390-fix.patch deleted file mode 100644 index c0a124c4c..000000000 --- a/s390-fix.patch +++ /dev/null @@ -1,64 +0,0 @@ -From dd1023c89ec47e2abc7ba26b07251e92211e76bb Mon Sep 17 00:00:00 2001 -From: Stephen Rothwell <sfr@canb.auug.org.au> -Date: Tue, 4 Jul 2017 17:58:18 +1000 -Subject: 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> ---- - drivers/s390/block/scm_blk.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c -index 42018a2..0071feb 100644 ---- a/drivers/s390/block/scm_blk.c -+++ b/drivers/s390/block/scm_blk.c -@@ -278,7 +278,7 @@ struct scm_queue { - 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) - { - 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); - if (!scm_permit_request(bdev, req)) { - spin_unlock(&sq->lock); -- return BLK_MQ_RQ_QUEUE_BUSY; -+ return BLK_STS_RESOURCE; - } - - scmrq = sq->scmrq; -@@ -299,7 +299,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx, - if (!scmrq) { - SCM_LOG(5, "no request"); - spin_unlock(&sq->lock); -- return BLK_MQ_RQ_QUEUE_BUSY; -+ return BLK_STS_RESOURCE; - } - scm_request_init(bdev, scmrq); - sq->scmrq = scmrq; -@@ -315,7 +315,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx, - - sq->scmrq = NULL; - spin_unlock(&sq->lock); -- return BLK_MQ_RQ_QUEUE_BUSY; -+ return BLK_STS_RESOURCE; - } - blk_mq_start_request(req); - -@@ -324,7 +324,7 @@ static int scm_blk_request(struct blk_mq_hw_ctx *hctx, - sq->scmrq = NULL; - } - 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, --- -cgit v1.1 - |