From: Jens Axboe <axboe@kernel•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
James Bottomley <James.Bottomley@HansenPartnership•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Ram Pai <linuxram@us•ibm.com>, Christoph Hellwig <hch@lst•de>
Subject: Re: linux-next: build failure after merge of the scsi tree
Date: Mon, 13 Feb 2017 09:18:54 -0700 [thread overview]
Message-ID: <7d68b81b-cdc0-c39c-e83e-4e19f9e07487@kernel.dk> (raw)
In-Reply-To: <20170213113226.2ffbf8ef@canb.auug.org.au>
On 02/12/2017 05:32 PM, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 6 Feb 2017 16:04:51 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>
>> After merging the scsi tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> In file included from include/uapi/linux/stddef.h:1:0,
>> from include/linux/stddef.h:4,
>> from include/uapi/linux/posix_types.h:4,
>> from include/uapi/linux/types.h:13,
>> from include/linux/types.h:5,
>> from include/linux/list.h:4,
>> from include/linux/module.h:9,
>> from drivers/scsi/mpt3sas/mpt3sas_scsih.c:45:
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:28: error: 'struct request' has no member named 'cmd_type'
>> if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>> ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>> # define unlikely(x) __builtin_expect(!!(x), 0)
>> ^
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: error: 'REQ_TYPE_FS' undeclared (first use in this function)
>> if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>> ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>> # define unlikely(x) __builtin_expect(!!(x), 0)
>> ^
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: note: each undeclared identifier is reported only once for each function it appears in
>> if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>> ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>> # define unlikely(x) __builtin_expect(!!(x), 0)
>> ^
>>
>> Caused by commit
>>
>> f2e767bb5d6e ("scsi: mpt3sas: Force request partial completion alignment")
>>
>> interacting with commit
>>
>> aebf526b53ae ("block: fold cmd_type into the REQ_OP_ space")
>>
>> from the block tree.
>>
>> I have applied teh following merge fix patch:
>>
>> From: Stephen Rothwell <sfr@canb•auug.org.au>
>> Date: Mon, 6 Feb 2017 16:00:54 +1100
>> Subject: [PATCH] scsi: mpt3sas: fix up for "block: fold cmd_type into the
>> REQ_OP_ space"
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
>> ---
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> index 5f7b0c7d7e4d..81a64678390d 100644
>> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> @@ -4747,7 +4747,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
>> * then scsi-ml does not need to handle this misbehavior.
>> */
>> sector_sz = scmd->device->sector_size;
>> - if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>> + if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz &&
>> xfer_cnt % sector_sz)) {
>> sdev_printk(KERN_INFO, scmd->device,
>> "unaligned partial completion avoided (xfer_cnt=%u, sector_sz=%u)\n",
>> --
>> 2.10.2
>
> The scsi tree commit has been merged into Linus' tree, so this
> interaction occurs between tyhe block tree and Linus' tree, now.
Thanks Stephen, I'll prepare a merged tree as well for Linus, so we
don't lose this when the block tree is merged for 4.11.
--
Jens Axboe
next prev parent reply other threads:[~2017-02-13 16:18 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-06 5:04 linux-next: build failure after merge of the scsi tree Stephen Rothwell
2017-02-13 0:32 ` Stephen Rothwell
2017-02-13 16:18 ` Jens Axboe [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-03-20 0:48 Stephen Rothwell
2017-08-28 8:02 Stephen Rothwell
2016-12-23 0:45 Stephen Rothwell
2016-12-23 0:56 ` James Bottomley
[not found] ` <20161224123853.08284e8a@canb.auug.org.au>
2016-12-24 10:15 ` Ingo Molnar
2016-12-24 10:44 ` Stephen Rothwell
2016-12-24 11:46 ` Thomas Gleixner
2016-12-24 16:48 ` James Bottomley
2015-11-13 1:35 Stephen Rothwell
2015-11-13 8:32 ` Sreekanth Reddy
2015-06-02 8:06 Stephen Rothwell
2015-06-02 15:02 ` James Bottomley
2015-02-04 6:29 Stephen Rothwell
2015-02-04 6:47 ` Joe Perches
2015-02-04 15:26 ` James Bottomley
2014-11-10 6:15 Stephen Rothwell
2014-11-10 6:27 ` Anish Bhatt
2014-11-10 13:46 ` Christoph Hellwig
2014-11-10 15:21 ` James Bottomley
2014-11-10 15:48 ` Christoph Hellwig
2014-11-10 15:50 ` James Bottomley
2014-11-10 16:01 ` Christoph Hellwig
2014-11-04 4:43 Stephen Rothwell
2014-11-04 7:07 ` Hannes Reinecke
2014-11-05 4:48 ` Stephen Rothwell
2014-11-03 2:52 Stephen Rothwell
2014-11-03 7:51 ` Hannes Reinecke
2014-11-03 18:31 ` Christoph Hellwig
2014-09-26 8:34 Stephen Rothwell
2014-09-26 8:36 ` Christoph Hellwig
2014-09-26 9:57 ` James Bottomley
2014-09-26 12:43 ` Brian King
2013-01-12 2:23 wenxiong
2013-01-11 1:03 Stephen Rothwell
2013-01-11 7:34 ` James Bottomley
2013-01-11 15:27 ` Brian King
2013-01-11 15:37 ` James Bottomley
2013-01-11 16:05 ` Greg KH
2013-01-11 17:35 ` Brian King
2013-01-11 18:04 ` James Bottomley
2012-07-20 0:41 Stephen Rothwell
2012-07-20 8:50 ` James Bottomley
2012-03-26 1:17 Stephen Rothwell
2012-03-26 7:57 ` James Bottomley
2012-03-26 14:07 ` Greg KH
2012-03-27 7:29 ` James Bottomley
2012-03-27 22:17 ` Alexey Dobriyan
2012-03-27 22:22 ` Greg KH
2012-03-27 22:35 ` Alexey Dobriyan
2012-03-27 22:39 ` Alexey Dobriyan
2012-03-28 23:54 ` Greg KH
2012-03-29 19:38 ` Greg KH
2012-03-28 23:52 ` Greg KH
2012-03-29 7:32 ` Gerard Snitselaar
2012-03-29 8:25 ` Stephen Rothwell
2012-03-29 8:35 ` James Bottomley
2012-03-29 9:03 ` Gerard Snitselaar
2012-03-29 16:15 ` Greg KH
2012-03-23 2:00 Stephen Rothwell
2012-03-23 4:50 ` Benjamin Herrenschmidt
2012-03-23 8:14 ` James Bottomley
2012-03-23 8:53 ` Benjamin Herrenschmidt
2012-03-23 9:01 ` James Bottomley
2012-03-23 15:22 ` Jeff Garzik
2012-03-23 10:26 ` Alexey Dobriyan
2012-03-23 15:30 ` Jeff Garzik
2012-03-23 8:20 ` James Bottomley
2012-03-23 9:24 ` Stephen Rothwell
2011-12-15 1:58 Stephen Rothwell
2011-12-15 6:53 ` James Bottomley
2011-08-29 2:09 Stephen Rothwell
2011-08-29 7:17 ` James Bottomley
2011-08-29 8:07 ` Giridhar Malavali
2011-05-27 3:25 Stephen Rothwell
2011-05-27 13:47 ` James Bottomley
2010-10-26 0:19 Stephen Rothwell
2010-10-26 15:50 ` James Bottomley
2010-02-10 1:33 Stephen Rothwell
2010-02-10 22:16 ` James Bottomley
2010-02-10 23:11 ` Stephen Rothwell
2010-02-16 0:38 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7d68b81b-cdc0-c39c-e83e-4e19f9e07487@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxram@us$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox