On 3/11/21 8:17 PM, Stephen Rothwell wrote: > Hi all, > > After merging the scsi-mkp tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > > drivers/scsi/sg.c: In function 'sg_mk_kern_bio': > drivers/scsi/sg.c:2958:17: error: 'BIO_MAX_PAGES' undeclared (first use in this function); did you mean 'BIO_MAX_VECS'? > 2958 | if (bvec_cnt > BIO_MAX_PAGES) > | ^~~~~~~~~~~~~ > | BIO_MAX_VECS > > Caused by commit > > b32ac463cb59 ("scsi: sg: NO_DXFER move to/from kernel buffers") > > interacting with commit > > a8affc03a9b3 ("block: rename BIO_MAX_PAGES to BIO_MAX_VECS") > > from the block tree. > > I have applied the following merge fix patch: > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Fri, 12 Mar 2021 14:11:16 +1100 > Subject: [PATCH] scsi: sg: fix up for BIO_MAX_PAGES rename > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > --- > drivers/scsi/sg.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c > index 2d4bbc1a1727..6b31b2bc8f9a 100644 > --- a/drivers/scsi/sg.c > +++ b/drivers/scsi/sg.c > @@ -2955,7 +2955,7 @@ sg_mk_kern_bio(int bvec_cnt) > { > struct bio *biop; > > - if (bvec_cnt > BIO_MAX_PAGES) > + if (bvec_cnt > BIO_MAX_VECS) > return NULL; > biop = bio_alloc(GFP_ATOMIC, bvec_cnt); > if (!biop) Looks good - fwiw, the block change will go into 5.12-rc3 to avoid having this issue over a merge window prep, so maybe SCSI can pull in -rc3 and get this resolved locally in that tree. I'll rebase the block-5.12 branch off -rc1 after this merge. -- Jens Axboe