From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Ott Subject: Re: linux-next: build failure after merge of the block tree Date: Mon, 19 Jun 2017 11:00:23 +0200 (CEST) Message-ID: References: <20170613205409.4b7e06f9@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Return-path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44456 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753591AbdFSJAb (ORCPT ); Mon, 19 Jun 2017 05:00:31 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5J8xFPa011213 for ; Mon, 19 Jun 2017 05:00:30 -0400 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0a-001b2d01.pphosted.com with ESMTP id 2b64mrgdxx-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 19 Jun 2017 05:00:30 -0400 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 19 Jun 2017 10:00:28 +0100 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Jens Axboe , Martin Schwidefsky , Heiko Carstens , Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig On Thu, 15 Jun 2017, Sebastian Ott wrote: > On Tue, 13 Jun 2017, Stephen Rothwell wrote: > > After merging the block tree, today's linux-next build (s390x > > s390-defconfig) failed like this: > > > > drivers/s390/block/scm_blk.c:293:10: error: 'BLK_MQ_RQ_QUEUE_BUSY' undeclared (first use in this function) > > drivers/s390/block/scm_blk.c:327:9: error: 'BLK_MQ_RQ_QUEUE_OK' undeclared (first use in this function) > > > > Caused by commit > > > > fc17b6534eb8 ("blk-mq: switch ->queue_rq return value to blk_status_t") > > > > interacting with commit > > > > 12d907626539 ("s390/scm: convert to blk-mq") > > > > from the s390 tree. > > > > Is the following the correct merge fixup? > > Yes, that looks good! Ok, we should also adjust the return code to fix this: drivers/s390/block/scm_blk.c:426:2: warning: initialization from incompatible pointer type [enabled by default] .queue_rq = scm_blk_request, ^ diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c index 2cd6123c8f18..4279685901bf 100644 --- a/drivers/s390/block/scm_blk.c +++ b/drivers/s390/block/scm_blk.c @@ -278,8 +278,8 @@ struct scm_queue { spinlock_t lock; }; -static int scm_blk_request(struct blk_mq_hw_ctx *hctx, - const struct blk_mq_queue_data *qd) +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; struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);