linux-next: build failure after merge of the btrfs tree

[Stephen Rothwell]

Hi all,

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

fs/btrfs/extent_io.c: In function 'btrfs_bio_clone':
fs/btrfs/extent_io.c:2734:10: error: 'struct bio' has no member named 'bi_css'
   if (bio->bi_css)
          ^
fs/btrfs/extent_io.c:2735:32: error: 'struct bio' has no member named 'bi_css'
    bio_associate_blkcg(new, bio->bi_css);
                                ^
fs/btrfs/volumes.c: In function 'breakup_stripe_bio':
fs/btrfs/volumes.c:5958:15: error: 'struct bio' has no member named 'bi_ioc'
  if (first_bio->bi_ioc) {
               ^
fs/btrfs/volumes.c:5959:34: error: 'struct bio' has no member named 'bi_ioc'
   get_io_context_active(first_bio->bi_ioc);
                                  ^
fs/btrfs/volumes.c:5960:6: error: 'struct bio' has no member named 'bi_ioc'
   bio->bi_ioc = first_bio->bi_ioc;
      ^
fs/btrfs/volumes.c:5960:26: error: 'struct bio' has no member named 'bi_ioc'
   bio->bi_ioc = first_bio->bi_ioc;
                          ^
fs/btrfs/volumes.c:5962:15: error: 'struct bio' has no member named 'bi_css'
  if (first_bio->bi_css) {
               ^
fs/btrfs/volumes.c:5963:20: error: 'struct bio' has no member named 'bi_css'
   css_get(first_bio->bi_css);
                    ^
fs/btrfs/volumes.c:5964:6: error: 'struct bio' has no member named 'bi_css'
   bio->bi_css = first_bio->bi_css;
      ^
fs/btrfs/volumes.c:5964:26: error: 'struct bio' has no member named 'bi_css'
   bio->bi_css = first_bio->bi_css;
                          ^

Caused by commit

  da2f0f74cf7d ("Btrfs: add support for blkio controllers")

This build does ont have CONFIG_BLK_CGROUP set.

I have used the btrfs tree from next-20150820 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/