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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

Hi Neil,

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

ERROR: ".bitmap_resize" [drivers/md/raid456.ko] undefined!
ERROR: ".bitmap_resize" [drivers/md/raid10.ko] undefined!

Caused by commit 89efe2ab3a8c ("md/bitmap: add bitmap_resize function to
allow bitmap resizing") and followups.

I have used the md tree form next-20120418 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the md tree

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 637 bytes --]

On Thu, 19 Apr 2012 12:55:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:

> Hi Neil,
> 
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: ".bitmap_resize" [drivers/md/raid456.ko] undefined!
> ERROR: ".bitmap_resize" [drivers/md/raid10.ko] undefined!
> 
> Caused by commit 89efe2ab3a8c ("md/bitmap: add bitmap_resize function to
> allow bitmap resizing") and followups.
> 
> I have used the md tree form next-20120418 for today.

Thanks a lot Stephen.

I've add the missing EXPORT_SYMBOL_GPL(), so should be fine for next time
round.

NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: linux-next: build failure after merge of the md tree

[Stephen Rothwell]

Hi all,

With the merge window opening, just a reminder that this merge fixup is
still required.

On Thu, 22 Jun 2017 11:44:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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

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

[Stephen Rothwell]

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

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

[Stephen Rothwell]

Hi Shaohua,

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

drivers/md/raid1.c: In function 'raid1_write_request':
drivers/md/raid1.c:1359:7: error: 'struct bio' has no member named 'bi_error'
    bio->bi_error = -ETIMEDOUT;
       ^
drivers/md/raid5.c: In function 'raid5_make_request':
drivers/md/raid5.c:5712:8: error: 'struct bio' has no member named 'bi_error'
      bi->bi_error = -ETIMEDOUT;
        ^

Caused by commit

  261eb8c4c5a8 ("md: make suspend range wait timed out")

interacting with commit

  4e4cbee93d56 ("block: switch bios to blk_status_t")

from the block tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Jun 2017 11:54:37 +1000
Subject: [PATCH] md: fixup for "block: switch bios to blk_status_t"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/md/raid1.c | 2 +-
 drivers/md/raid5.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e320138916cc..db2ad0eeef22 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1356,7 +1356,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
 		if (remaining == 0) {
 			pr_err("md/raid1:%s: suspend range is locked\n",
 				mdname(mddev));
-			bio->bi_error = -ETIMEDOUT;
+			bio->bi_status = BLK_STS_TIMEOUT;
 			bio_endio(bio);
 			return;
 		}
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2a6634b7357b..3b3005c87b4b 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5709,7 +5709,7 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi)
 				if (remaining == 0) {
 					pr_err("md/raid5:%s: suspend range is locked\n",
 						mdname(mddev));
-					bi->bi_error = -ETIMEDOUT;
+					bi->bi_status = BLK_STS_TIMEOUT;
 					break;
 				}
 				goto retry;


-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the md tree

[Guoqing Jiang]

Stephen Rothwell wrote:
> Hi Neil,
>
> On Mon, 2 Mar 2015 17:11:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>   
>> On Mon, 2 Mar 2015 17:03:45 +1100 NeilBrown <neilb@suse.de> wrote:
>>     
>>> I think
>>> +               bm_blocks = DIV_ROUND_UP(bm_blocks, 4096);
>>>
>>> needs DIV_ROUND_UP_SECTOR_T()
>>>       
>> I tried that and it was not sufficient.
>>
>>     
>>> The first patch you identified adds that line.  The second relocates it.
>>>       
>> The second also changes this:
>>
>> bm_blocks = sector_div(bitmap->mddev->resync_max_sectors, (chunksize >> 9));
>>
>> (added by the first) to this:
>>
>> bm_blocks = bitmap->mddev->resync_max_sectors / (bitmap->mddev->bitmap_info.chunksize >> 9);
>>
>> where bitmap->mddev->resync_max_sectors is a sector_t ...
>>     
>
> So I applied this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 3 Mar 2015 13:30:26 +1100
> Subject: [PATCH] md/bitmap: use sector_div for sector_t divisions
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/md/bitmap.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
> index 23f575f0cd92..d40398404ab6 100644
> --- a/drivers/md/bitmap.c
> +++ b/drivers/md/bitmap.c
> @@ -573,7 +573,8 @@ re_read:
>  	if (bitmap->cluster_slot >= 0) {
>  		long long bm_blocks;
>  
> -		bm_blocks = bitmap->mddev->resync_max_sectors / (bitmap->mddev->bitmap_info.chunksize >> 9);
> +		bm_blocks = sector_div(bitmap->mddev->resync_max_sectors,
> +				       bitmap->mddev->bitmap_info.chunksize >> 9);
>   
One simple question, isn't the sector_div used for change '%' operator?
but the modified line is:

bm_blocks = bitmap->mddev->resync_max_sectors */* (bitmap->mddev->bitmap_info.chunksize >> 9);

But, the modified is:

bm_blocks = sector_div(bitmap->mddev->resync_max_sectors,
		       bitmap->mddev->bitmap_info.chunksize >> 9);

The sector_div returns:

bitmap->mddev->resync_max_sectors % bitmap->mddev->bitmap_info.chunksize >> 9

So it basically means :

bm_blocks = bitmap->mddev->resync_max_sectors % bitmap->mddev->bitmap_info.chunksize >> 9


And maybe the current next tree should add the following change to keep
original semantic.

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 501f83f..ea9c685 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -571,11 +571,10 @@ static int bitmap_read_sb(struct bitmap *bitmap)
 re_read:
        /* If cluster_slot is set, the cluster is setup */
        if (bitmap->cluster_slot >= 0) {
-               sector_t bm_blocks;
-               sector_t resync_sectors = bitmap->mddev->resync_max_sectors;
+               sector_t bm_blocks = bitmap->mddev->resync_max_sectors;
 
-               bm_blocks = sector_div(resync_sectors,
-                                     
bitmap->mddev->bitmap_info.chunksize >> 9);
+               sector_div(bm_blocks,
+                               bitmap->mddev->bitmap_info.chunksize >> 9);
                bm_blocks = bm_blocks << 3;
                bm_blocks = DIV_ROUND_UP_SECTOR_T(bm_blocks, 4096);
                bitmap->mddev->bitmap_info.offset +=
bitmap->cluster_slot * (bm_blocks << 3);


Thanks,
Guoqing
>  		bm_blocks = bm_blocks << 3;
>  		bm_blocks = DIV_ROUND_UP_SECTOR_T(bm_blocks, 4096);
>  		bitmap->mddev->bitmap_info.offset += bitmap->cluster_slot * (bm_blocks << 3);
>   

Re: linux-next: build failure after merge of the md tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

Hi Neil,

On Wed, 4 Mar 2015 13:44:18 +1100 NeilBrown <neilb@suse.de> wrote:
>
> sector_div() leave the remainder in it's first argument, so this isn't quite
> correct - you need to store resync_max_sectors in a temp variable.
> So I made that change and applied you patch.

OK, good catch.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the md tree

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 2121 bytes --]

On Tue, 3 Mar 2015 13:35:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:

> Hi Neil,
> 
> On Mon, 2 Mar 2015 17:11:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 2 Mar 2015 17:03:45 +1100 NeilBrown <neilb@suse.de> wrote:
> > >
> > > I think
> > > +               bm_blocks = DIV_ROUND_UP(bm_blocks, 4096);
> > > 
> > > needs DIV_ROUND_UP_SECTOR_T()
> > 
> > I tried that and it was not sufficient.
> > 
> > > The first patch you identified adds that line.  The second relocates it.
> > 
> > The second also changes this:
> > 
> > bm_blocks = sector_div(bitmap->mddev->resync_max_sectors, (chunksize >> 9));
> > 
> > (added by the first) to this:
> > 
> > bm_blocks = bitmap->mddev->resync_max_sectors / (bitmap->mddev->bitmap_info.chunksize >> 9);
> > 
> > where bitmap->mddev->resync_max_sectors is a sector_t ...
> 
> So I applied this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 3 Mar 2015 13:30:26 +1100
> Subject: [PATCH] md/bitmap: use sector_div for sector_t divisions
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/md/bitmap.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
> index 23f575f0cd92..d40398404ab6 100644
> --- a/drivers/md/bitmap.c
> +++ b/drivers/md/bitmap.c
> @@ -573,7 +573,8 @@ re_read:
>  	if (bitmap->cluster_slot >= 0) {
>  		long long bm_blocks;
>  
> -		bm_blocks = bitmap->mddev->resync_max_sectors / (bitmap->mddev->bitmap_info.chunksize >> 9);
> +		bm_blocks = sector_div(bitmap->mddev->resync_max_sectors,
> +				       bitmap->mddev->bitmap_info.chunksize >> 9);
>  		bm_blocks = bm_blocks << 3;
>  		bm_blocks = DIV_ROUND_UP_SECTOR_T(bm_blocks, 4096);
>  		bitmap->mddev->bitmap_info.offset += bitmap->cluster_slot * (bm_blocks << 3);


Thanks!
sector_div() leave the remainder in it's first argument, so this isn't quite
correct - you need to store resync_max_sectors in a temp variable.
So I made that change and applied you patch.

Thanks,
NeilBrown

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

Re: linux-next: build failure after merge of the md tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1795 bytes --]

Hi Neil,

On Mon, 2 Mar 2015 17:11:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 2 Mar 2015 17:03:45 +1100 NeilBrown <neilb@suse.de> wrote:
> >
> > I think
> > +               bm_blocks = DIV_ROUND_UP(bm_blocks, 4096);
> > 
> > needs DIV_ROUND_UP_SECTOR_T()
> 
> I tried that and it was not sufficient.
> 
> > The first patch you identified adds that line.  The second relocates it.
> 
> The second also changes this:
> 
> bm_blocks = sector_div(bitmap->mddev->resync_max_sectors, (chunksize >> 9));
> 
> (added by the first) to this:
> 
> bm_blocks = bitmap->mddev->resync_max_sectors / (bitmap->mddev->bitmap_info.chunksize >> 9);
> 
> where bitmap->mddev->resync_max_sectors is a sector_t ...

So I applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Mar 2015 13:30:26 +1100
Subject: [PATCH] md/bitmap: use sector_div for sector_t divisions

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

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 23f575f0cd92..d40398404ab6 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -573,7 +573,8 @@ re_read:
 	if (bitmap->cluster_slot >= 0) {
 		long long bm_blocks;
 
-		bm_blocks = bitmap->mddev->resync_max_sectors / (bitmap->mddev->bitmap_info.chunksize >> 9);
+		bm_blocks = sector_div(bitmap->mddev->resync_max_sectors,
+				       bitmap->mddev->bitmap_info.chunksize >> 9);
 		bm_blocks = bm_blocks << 3;
 		bm_blocks = DIV_ROUND_UP_SECTOR_T(bm_blocks, 4096);
 		bitmap->mddev->bitmap_info.offset += bitmap->cluster_slot * (bm_blocks << 3);
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the md tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 691 bytes --]

Hi Neil,

On Mon, 2 Mar 2015 17:03:45 +1100 NeilBrown <neilb@suse.de> wrote:
>
> I think
> +               bm_blocks = DIV_ROUND_UP(bm_blocks, 4096);
> 
> needs DIV_ROUND_UP_SECTOR_T()

I tried that and it was not sufficient.

> The first patch you identified adds that line.  The second relocates it.

The second also changes this:

bm_blocks = sector_div(bitmap->mddev->resync_max_sectors, (chunksize >> 9));

(added by the first) to this:

bm_blocks = bitmap->mddev->resync_max_sectors / (bitmap->mddev->bitmap_info.chunksize >> 9);

where bitmap->mddev->resync_max_sectors is a sector_t ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the md tree

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 909 bytes --]

On Mon, 2 Mar 2015 16:50:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:

> Hi Neil,
> 
> After merging the md tree, today's linux-next build (i386 defconfig)
> failed like this:
> 
> drivers/built-in.o: In function `bitmap_read_sb':
> bitmap.c:(.text+0x29cd52): undefined reference to `__udivdi3'
> 
> Probably caused by commit b97e92574c0b ("Use separate bitmaps for each
> nodes in the cluster") or commit f9209a323547 ("bitmap_create returns
> bitmap pointer").
> 
> I reverted the md tree for today (because I am not sure how to fix
> this and reverting less became messy).
> 

Thanks.
I think
+               bm_blocks = DIV_ROUND_UP(bm_blocks, 4096);

needs DIV_ROUND_UP_SECTOR_T()


The first patch you identified adds that line.  The second relocates it.

I've queued a fix-up for now, but I might get it merged back into the
original...


Thanks,
NeilBrown

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

Hi Neil,

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

drivers/built-in.o: In function `bitmap_read_sb':
bitmap.c:(.text+0x29cd52): undefined reference to `__udivdi3'

Probably caused by commit b97e92574c0b ("Use separate bitmaps for each
nodes in the cluster") or commit f9209a323547 ("bitmap_create returns
bitmap pointer").

I reverted the md tree for today (because I am not sure how to fix
this and reverting less became messy).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the md tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

Hi Neil,

On Tue, 25 Sep 2012 14:10:05 +1000 NeilBrown <neilb@suse.de> wrote:
>
> I requires the following which I have already sent to Jens Axboe.
> I might pull my patch until this fix-up is resolve.

Or just ask Jens if you can submit that patch through your tree (with his
Ack) since you are the one who needs it?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the md tree

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 1381 bytes --]

On Tue, 25 Sep 2012 13:31:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:

> Hi Neil,
> 
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: "__tracepoint_block_unplug" [drivers/md/raid456.ko] undefined!
> 
> Presumably caused by commit 14817e9a6dab ("md/raid5: add blktrace calls").
> 
> CONFIG_MD_RAID456=m
> 
> I have used the md tree from next-20120924 for today.

Thanks.
I requires the following which I have already sent to Jens Axboe.
I might pull my patch until this fix-up is resolve.

Thanks,
NeilBrown


From 0ef9cbd6e5c6f6c9f303c8a7c905afb3fb55c28d Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 25 Sep 2012 09:56:31 +1000
Subject: [PATCH] block: export trace_block_unplug

This allows stacked devices (like md/raid5) to provide blktrace
tracing, including unplug events.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/block/blk-core.c b/block/blk-core.c
index 4b4dbdf..ef55ae0 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -40,6 +40,7 @@
 EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_remap);
 EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap);
 EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete);
+EXPORT_TRACEPOINT_SYMBOL_GPL(block_unplug);
 
 DEFINE_IDA(blk_queue_ida);
 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

Hi Neil,

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

ERROR: "__tracepoint_block_unplug" [drivers/md/raid456.ko] undefined!

Presumably caused by commit 14817e9a6dab ("md/raid5: add blktrace calls").

CONFIG_MD_RAID456=m

I have used the md tree from next-20120924 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the md tree

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]

On Wed, 11 Apr 2012 13:42:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:

> Hi Neil,
> 
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> lib/raid6/recov.c: In function 'raid6_has_ssse3':
> lib/raid6/recov.c:27:2: error: implicit declaration of function 'boot_cpu_has' [-Werror=implicit-function-declaration]
> lib/raid6/recov.c:27:22: error: 'X86_FEATURE_XMM' undeclared (first use in this function)
> lib/raid6/recov.c:27:22: note: each undeclared identifier is reported only once for each function it appears in
> lib/raid6/recov.c:28:16: error: 'X86_FEATURE_XMM2' undeclared (first use in this function)
> lib/raid6/recov.c:29:16: error: 'X86_FEATURE_SSSE3' undeclared (first use in this function)
> lib/raid6/recov.c: At top level:
> lib/raid6/recov.c:25:12: warning: 'raid6_has_ssse3' defined but not used [-Wunused-function]
> 
> Caused by commit 56d3ac7ef905 ("lib/raid6: Add SSSE3 optimized recovery
> functions").  All the world is not X86 :-)
> 
> I have used the md tree from next-20120410 for today.

Thanks Stephen,
I've removed that set of patches from my for-next pending further review and
revision.

Thanks,
NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: linux-next: build failure after merge of the md tree

[H. Peter Anvin]

On 04/10/2012 08:42 PM, Stephen Rothwell wrote:
> Hi Neil,
> 
> After merging the md tree, today's linux-next build (powerpc 
> ppc64_defconfig) failed like this:
> 
> lib/raid6/recov.c: In function 'raid6_has_ssse3': 
> lib/raid6/recov.c:27:2: error: implicit declaration of function
> 'boot_cpu_has' [-Werror=implicit-function-declaration] 
> lib/raid6/recov.c:27:22: error: 'X86_FEATURE_XMM' undeclared (first
> use in this function) lib/raid6/recov.c:27:22: note: each
> undeclared identifier is reported only once for each function it
> appears in lib/raid6/recov.c:28:16: error: 'X86_FEATURE_XMM2'
> undeclared (first use in this function) lib/raid6/recov.c:29:16:
> error: 'X86_FEATURE_SSSE3' undeclared (first use in this function) 
> lib/raid6/recov.c: At top level: lib/raid6/recov.c:25:12: warning:
> 'raid6_has_ssse3' defined but not used [-Wunused-function]
> 
> Caused by commit 56d3ac7ef905 ("lib/raid6: Add SSSE3 optimized
> recovery functions").  All the world is not X86 :-)
> 
> I have used the md tree from next-20120410 for today.

While on the subject it would be nice to factor this out into a
separate file.

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]

Hi Neil,

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

lib/raid6/recov.c: In function 'raid6_has_ssse3':
lib/raid6/recov.c:27:2: error: implicit declaration of function 'boot_cpu_has' [-Werror=implicit-function-declaration]
lib/raid6/recov.c:27:22: error: 'X86_FEATURE_XMM' undeclared (first use in this function)
lib/raid6/recov.c:27:22: note: each undeclared identifier is reported only once for each function it appears in
lib/raid6/recov.c:28:16: error: 'X86_FEATURE_XMM2' undeclared (first use in this function)
lib/raid6/recov.c:29:16: error: 'X86_FEATURE_SSSE3' undeclared (first use in this function)
lib/raid6/recov.c: At top level:
lib/raid6/recov.c:25:12: warning: 'raid6_has_ssse3' defined but not used [-Wunused-function]

Caused by commit 56d3ac7ef905 ("lib/raid6: Add SSSE3 optimized recovery
functions").  All the world is not X86 :-)

I have used the md tree from next-20120410 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the md tree

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 676 bytes --]

On Wed, 28 Mar 2012 14:32:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:

> Hi Neil,
> 
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/md/raid5.c: In function 'analyse_stripe':
> drivers/md/raid5.c:3209:33: error: 'struct stripe_head' has no member named 'devs'
> 
> Caused by commit 85e25cfc6bed ("md/raid5: fix handling of bad blocks
> during recovery").
> 
> I have used the version of the md tree from next-20120327 for today.

Sorry 'bout that.  I noticed not long after I had pushed out for-next and
fixed it.  You must have pulled during that window :-(

Thanks,
NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

Hi Neil,

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

drivers/md/raid5.c: In function 'analyse_stripe':
drivers/md/raid5.c:3209:33: error: 'struct stripe_head' has no member named 'devs'

Caused by commit 85e25cfc6bed ("md/raid5: fix handling of bad blocks
during recovery").

I have used the version of the md tree from next-20120327 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the md tree

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 5426 bytes --]

On Tue, 11 Oct 2011 16:29:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:

> Hi Neil,
> 
> After merging the md tree, today's linux-next build (x86_64_allmodconfig)
> failed like this:
> 
> drivers/md/dm-raid.c:597:25: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:614:24: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:614:40: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:654:23: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:654:41: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:692:34: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:692:50: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:812:27: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:812:43: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c: In function 'analyse_superblocks':
> drivers/md/dm-raid.c:852:2: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:853:2: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:853:19: warning: initialization from incompatible pointer type [enabled by default]
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:857:12: error: request for member 'meta_bdev' in something not a structure or union
> drivers/md/dm-raid.c:860:3: error: implicit declaration of function 'super_load' [-Werror=implicit-function-declaration]
> drivers/md/dm-raid.c:882:2: error: implicit declaration of function 'super_validate' [-Werror=implicit-function-declaration]
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c: In function 'raid_ctr':
> drivers/md/dm-raid.c:965:22: error: 'super_sync' undeclared (first use in this function)
> drivers/md/dm-raid.c:965:22: note: each undeclared identifier is reported only once for each function it appears in
> drivers/md/dm-raid.c: In function 'raid_status':
> drivers/md/dm-raid.c:1100:4: error: unknown type name 'raid5_conf_t'
> drivers/md/dm-raid.c:1103:4: error: request for member 'max_nr_stripes' in something not a structure or union
> drivers/md/dm-raid.c: In function 'raid_io_hints':
> drivers/md/dm-raid.c:1149:2: error: unknown type name 'raid5_conf_t'
> drivers/md/dm-raid.c:1152:46: error: request for member 'raid_disks' in something not a structure or union
> drivers/md/dm-raid.c:1152:65: error: request for member 'max_degraded' in something not a structure or union
> 
> Caused by commits 4251a3bcf0e1 ("md: removing typedefs:  mdk_rdev_t ->
> struct md_rdev") and 724d5bc7708a ("md: remove typedefs: mddev_t ->
> struct mddev").
> 
> Have you dropped better versions of these commits?  Please build test.

I'll add dm-raid back in to my build testing - I don't know why it dropped
out.

This will be fixed for tomorrow.
I might add the merge with the block layer too.

Thanks,
NeilBrown


> 
> I have used the version of the tree from next-20111006 since
> next-20111007 had another build problem.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5087 bytes --]

Hi Neil,

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

drivers/md/dm-raid.c:597:25: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:614:24: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:614:40: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:654:23: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:654:41: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:692:34: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:692:50: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:812:27: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:812:43: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c: In function 'analyse_superblocks':
drivers/md/dm-raid.c:852:2: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:853:2: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:853:19: warning: initialization from incompatible pointer type [enabled by default]
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:857:12: error: request for member 'meta_bdev' in something not a structure or union
drivers/md/dm-raid.c:860:3: error: implicit declaration of function 'super_load' [-Werror=implicit-function-declaration]
drivers/md/dm-raid.c:882:2: error: implicit declaration of function 'super_validate' [-Werror=implicit-function-declaration]
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c: In function 'raid_ctr':
drivers/md/dm-raid.c:965:22: error: 'super_sync' undeclared (first use in this function)
drivers/md/dm-raid.c:965:22: note: each undeclared identifier is reported only once for each function it appears in
drivers/md/dm-raid.c: In function 'raid_status':
drivers/md/dm-raid.c:1100:4: error: unknown type name 'raid5_conf_t'
drivers/md/dm-raid.c:1103:4: error: request for member 'max_nr_stripes' in something not a structure or union
drivers/md/dm-raid.c: In function 'raid_io_hints':
drivers/md/dm-raid.c:1149:2: error: unknown type name 'raid5_conf_t'
drivers/md/dm-raid.c:1152:46: error: request for member 'raid_disks' in something not a structure or union
drivers/md/dm-raid.c:1152:65: error: request for member 'max_degraded' in something not a structure or union

Caused by commits 4251a3bcf0e1 ("md: removing typedefs:  mdk_rdev_t ->
struct md_rdev") and 724d5bc7708a ("md: remove typedefs: mddev_t ->
struct mddev").

Have you dropped better versions of these commits?  Please build test.

I have used the version of the tree from next-20111006 since
next-20111007 had another build problem.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the md tree

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

On Fri, 7 Oct 2011 14:07:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:

> Hi Neil,
> 
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from drivers/md/raid1.c:40:0:
> drivers/md/raid1.h:71:2: error: expected ':', ',', ';', '}' or '__attribute__' before 'int'
> 
> and went downhill from there ...
> 
> Caused by commit 9d64362373aa ("md/raid1:  add documentation to
> r1_private_data_s data structure").  Please build test ...
> 
> I have used the md tree from next-20111006 for today.

I've fixed it up now. -- sorry about that.

NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

Hi Neil,

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

In file included from drivers/md/raid1.c:40:0:
drivers/md/raid1.h:71:2: error: expected ':', ',', ';', '}' or '__attribute__' before 'int'

and went downhill from there ...

Caused by commit 9d64362373aa ("md/raid1:  add documentation to
r1_private_data_s data structure").  Please build test ...

I have used the md tree from next-20111006 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]