linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shaohua Li <shli@kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	NeilBrown <neilb@suse.com>
Subject: linux-next: build failure after merge of the md tree
Date: Thu, 22 Jun 2017 11:44:56 +1000	[thread overview]
Message-ID: <20170622114456.329ec8ca@canb.auug.org.au> (raw)

Hi Shaohua,

After merging the md tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/md/md.c: In function 'md_run':
drivers/md/md.c:5449:21: error: too few arguments to function 'bioset_create'
   mddev->sync_set = bioset_create(BIO_POOL_SIZE, 0);
                     ^
In file included from include/linux/blkdev.h:20:0,
                 from drivers/md/md.c:49:
include/linux/bio.h:375:24: note: declared here
 extern struct bio_set *bioset_create(unsigned int, unsigned int, int flags);
                        ^

Caused by commit

  5a85071c2cbc ("md: use a separate bio_set for synchronous IO.")

interacting with commit

  011067b05668 ("blk: replace bioset_create_nobvec() with a flags arg to bioset_create()")

from the block tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 22 Jun 2017 11:42:02 +1000
Subject: [PATCH] md: fix up for "blk: replace bioset_create_nobvec() with a
 flags arg to bioset_create()"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/md/md.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index c5d9cac4760c..ffccee45af8c 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5446,7 +5446,7 @@ int md_run(struct mddev *mddev)
 			return -ENOMEM;
 	}
 	if (mddev->sync_set == NULL) {
-		mddev->sync_set = bioset_create(BIO_POOL_SIZE, 0);
+		mddev->sync_set = bioset_create(BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
 		if (!mddev->sync_set)
 			return -ENOMEM;
 	}
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

             reply	other threads:[~2017-06-22  1:44 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-22  1:44 Stephen Rothwell [this message]
2017-07-03  1:52 ` linux-next: build failure after merge of the md tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2017-06-14  1:58 Stephen Rothwell
2015-03-02  5:50 Stephen Rothwell
2015-03-02  6:03 ` NeilBrown
2015-03-02  6:11   ` Stephen Rothwell
2015-03-03  2:35     ` Stephen Rothwell
2015-03-04  2:44       ` NeilBrown
2015-03-04  2:48         ` Stephen Rothwell
2015-03-13  8:55       ` Guoqing Jiang
2012-09-25  3:31 Stephen Rothwell
2012-09-25  4:10 ` NeilBrown
2012-09-25  4:50   ` Stephen Rothwell
2012-04-19  2:55 Stephen Rothwell
2012-04-19  3:15 ` NeilBrown
2012-04-11  3:42 Stephen Rothwell
2012-04-11  3:54 ` H. Peter Anvin
2012-04-11  4:48 ` NeilBrown
2012-03-28  3:32 Stephen Rothwell
2012-03-28  4:07 ` NeilBrown
2011-10-11  5:29 Stephen Rothwell
2011-10-11  5:42 ` NeilBrown
2011-10-07  3:07 Stephen Rothwell
2011-10-07  3:34 ` NeilBrown

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=20170622114456.329ec8ca@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=neilb@suse.com \
    --cc=shli@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).