linux-next: md tree build failure

linux-next: md tree build failure

[Stephen Rothwell]

Hi Neil,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/md/raid1.c: In function 'sync_request':
drivers/md/raid1.c:1759: error: implicit declaration of function 'msleep_interruptible'
make[3]: *** [drivers/md/raid1.o] Error 1
make[3]: *** Waiting for unfinished jobs....
drivers/md/raid10.c: In function 'sync_request':
drivers/md/raid10.c:1749: error: implicit declaration of function 'msleep_interruptible'
make[3]: *** [drivers/md/raid10.o] Error 1
drivers/md/md.c: In function 'md_do_sync':
drivers/md/md.c:5915: error: implicit declaration of function 'msleep'

Caused by commit 6caa3b0bbdb474647f6bdd8a958ffc46f78d8d58 ("md: Remove
unnecessary #includes, #defines, and function declarations").  I added
the following patch.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Oct 2008 20:05:50 +1100
Subject: [PATCH] md: msleep need include of linux/delay.h

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

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 4c89836..abc82f2 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -45,6 +45,7 @@
 #include <linux/random.h>
 #include <linux/reboot.h>
 #include <linux/file.h>
+#include <linux/delay.h>
 
 #define MAJOR_NR MD_MAJOR
 
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b976442..9c788e2 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -32,6 +32,7 @@
  */
 
 #include "dm-bio-list.h"
+#include <linux/delay.h>
 #include <linux/raid/raid1.h>
 #include <linux/raid/bitmap.h>
 
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 8bdc9bf..7d7f345 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -19,6 +19,7 @@
  */
 
 #include "dm-bio-list.h"
+#include <linux/delay.h>
 #include <linux/raid/raid10.h>
 #include <linux/raid/bitmap.h>
 
-- 
1.5.6.5

Re: linux-next: md tree build failure

[Neil Brown]

On Wednesday October 15, sfr@canb.auug.org.au wrote:
> Hi Neil,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/md/raid1.c: In function 'sync_request':
> drivers/md/raid1.c:1759: error: implicit declaration of function 'msleep_interruptible'
> make[3]: *** [drivers/md/raid1.o] Error 1
> make[3]: *** Waiting for unfinished jobs....
> drivers/md/raid10.c: In function 'sync_request':
> drivers/md/raid10.c:1749: error: implicit declaration of function 'msleep_interruptible'
> make[3]: *** [drivers/md/raid10.o] Error 1
> drivers/md/md.c: In function 'md_do_sync':
> drivers/md/md.c:5915: error: implicit declaration of function 'msleep'
> 
> Caused by commit 6caa3b0bbdb474647f6bdd8a958ffc46f78d8d58 ("md: Remove
> unnecessary #includes, #defines, and function declarations").  I added
> the following patch.

Thanks.  I had heard of this problem in -mm but as I couldn't
reproduce it I thought it might be -mm specific and held off taking
the patch.
I'll add it to my tree now.

Thanks,
NeilBrown


> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 15 Oct 2008 20:05:50 +1100
> Subject: [PATCH] md: msleep need include of linux/delay.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/md/md.c     |    1 +
>  drivers/md/raid1.c  |    1 +
>  drivers/md/raid10.c |    1 +
>  3 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 4c89836..abc82f2 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -45,6 +45,7 @@
>  #include <linux/random.h>
>  #include <linux/reboot.h>
>  #include <linux/file.h>
> +#include <linux/delay.h>
>  
>  #define MAJOR_NR MD_MAJOR
>  
> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
> index b976442..9c788e2 100644
> --- a/drivers/md/raid1.c
> +++ b/drivers/md/raid1.c
> @@ -32,6 +32,7 @@
>   */
>  
>  #include "dm-bio-list.h"
> +#include <linux/delay.h>
>  #include <linux/raid/raid1.h>
>  #include <linux/raid/bitmap.h>
>  
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index 8bdc9bf..7d7f345 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -19,6 +19,7 @@
>   */
>  
>  #include "dm-bio-list.h"
> +#include <linux/delay.h>
>  #include <linux/raid/raid10.h>
>  #include <linux/raid/bitmap.h>
>  
> -- 
> 1.5.6.5

linux-next: md tree build failure

[Stephen Rothwell]

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

Hi Neil,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/md/raid10.c: In function 'sync_request':
drivers/md/raid10.c:1753: error: implicit declaration of function 'msleep_interruptible'

Caused by commit 10d4564a71c58e89ddee656eb6cb0fecf5ac4b3c ("md: move lots
of #include lines out of .h files and into .c").

I have merged the version of the md tree fomr next-20090306 instead of
today's.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: md tree build failure

[NeilBrown]

On Tue, March 10, 2009 4:47 pm, Stephen Rothwell wrote:
> Hi Neil,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> drivers/md/raid10.c: In function 'sync_request':
> drivers/md/raid10.c:1753: error: implicit declaration of function
> 'msleep_interruptible'
>
> Caused by commit 10d4564a71c58e89ddee656eb6cb0fecf5ac4b3c ("md: move lots
> of #include lines out of .h files and into .c").
>
> I have merged the version of the md tree fomr next-20090306 instead of
> today's.

Thanks.
I've fixed this now so you should get more happiness next time.

NeilBrown

Re: linux-next: md tree build failure

[Stephen Rothwell]

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

Hi Neil,

On Tue, 10 Mar 2009 17:38:19 +1100 (EST) "NeilBrown" <neilb@suse.de> wrote:
>
> I've fixed this now so you should get more happiness next time.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: md tree build failure

[Stephen Rothwell]

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

Hi Neil,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "raid6_empty_zero_page" [drivers/md/raid456.ko] undefined!
ERROR: "raid6_empty_zero_page" [crypto/async_tx/async_pq.ko] undefined!

Maybe caused by commit 4739d067d35c26093f4ba29a716ce9d60c36dc53
("md/raid5: move raid6 data processing to raid6_pq.ko")?

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

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

Re: linux-next: md tree build failure

[Neil Brown]

On Wednesday March 11, sfr@canb.auug.org.au wrote:
> Hi Neil,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> ERROR: "raid6_empty_zero_page" [drivers/md/raid456.ko] undefined!
> ERROR: "raid6_empty_zero_page" [crypto/async_tx/async_pq.ko] undefined!
> 
> Maybe caused by commit 4739d067d35c26093f4ba29a716ce9d60c36dc53
> ("md/raid5: move raid6 data processing to raid6_pq.ko")?
> 
> I have merged the version of the md tree from next-20090306 for today.

Thanks.
I've export raid6_empty_zero_page.  I think that is the correct fix.
So Monday should be a winner :-)

NeilBrown

Re: linux-next: md tree build failure

[Stephen Rothwell]

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

Hi Neil,

On Fri, 13 Mar 2009 11:45:59 +1100 Neil Brown <neilb@suse.de> wrote:
>
> I've export raid6_empty_zero_page.  I think that is the correct fix.
> So Monday should be a winner :-)

Thanks.  And you got in under the wire, so hopefully today will be a
winner.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: md tree build failure

[Stephen Rothwell]

Hi Neil,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/md/raid0.c: In function 'create_strip_zones':
drivers/md/raid0.c:243: error: 'struct request_queue' has no member named 'hardsect_size'

Caused by commit e1defc4ff0cf57aca6c5e3ff99fa503f5943c1f1 ("block: Do
away with the notion of hardsect_size") from the block tree interacting
with commit 131e4477401ae76a9cbe8539e4b7819e04cfba36 ("md: raid0: chunk
size check in raid0_run") from the md tree.

I applied the following patch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index b8a0747..0bf275d 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -240,7 +240,7 @@ static int create_strip_zones(mddev_t *mddev)
 	 * now since we have the hard sector sizes, we can make sure
 	 * chunk size is a multiple of that sector size
 	 */
-	if (mddev->chunk_size % mddev->queue->hardsect_size) {
+	if (mddev->chunk_size % queue_logical_block_size(mddev->queue)) {
 		printk(KERN_ERR "%s chunk_size of %d not valid\n",
 		       mdname(mddev),
 		       mddev->chunk_size);

Re: linux-next: md tree build failure

[Jens Axboe]

On Mon, May 25 2009, Stephen Rothwell wrote:
> Hi Neil,
> 
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> 
> drivers/md/raid0.c: In function 'create_strip_zones':
> drivers/md/raid0.c:243: error: 'struct request_queue' has no member named 'hardsect_size'
> 
> Caused by commit e1defc4ff0cf57aca6c5e3ff99fa503f5943c1f1 ("block: Do
> away with the notion of hardsect_size") from the block tree interacting
> with commit 131e4477401ae76a9cbe8539e4b7819e04cfba36 ("md: raid0: chunk
> size check in raid0_run") from the md tree.

Martin, this is starting to look like a disaster :-(

> 
> I applied the following patch.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
> index b8a0747..0bf275d 100644
> --- a/drivers/md/raid0.c
> +++ b/drivers/md/raid0.c
> @@ -240,7 +240,7 @@ static int create_strip_zones(mddev_t *mddev)
>  	 * now since we have the hard sector sizes, we can make sure
>  	 * chunk size is a multiple of that sector size
>  	 */
> -	if (mddev->chunk_size % mddev->queue->hardsect_size) {
> +	if (mddev->chunk_size % queue_logical_block_size(mddev->queue)) {
>  		printk(KERN_ERR "%s chunk_size of %d not valid\n",
>  		       mdname(mddev),
>  		       mddev->chunk_size);

-- 
Jens Axboe

Re: linux-next: md tree build failure

[Martin K. Petersen]

>>>>> "Jens" == Jens Axboe <jens.axboe@oracle.com> writes:

Jens> Martin, this is starting to look like a disaster :-(

Yeah.  I guess you should have pushed the accessors first and let that
patch steep for a while before applying the rest of the kit :|

It's just super bad timing that both Neil and Alasdair had patches to
their respective hardsect size areas right now.  Neither tree has been
touched in that department for ages...

*sigh*

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: linux-next: md tree build failure

[Stephen Rothwell]

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

On Mon, 25 May 2009 08:15:52 +0200 Jens Axboe <jens.axboe@oracle.com> wrote:
>
> On Mon, May 25 2009, Stephen Rothwell wrote:
> > 
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> > 
> > drivers/md/raid0.c: In function 'create_strip_zones':
> > drivers/md/raid0.c:243: error: 'struct request_queue' has no member named 'hardsect_size'
> > 
> > Caused by commit e1defc4ff0cf57aca6c5e3ff99fa503f5943c1f1 ("block: Do
> > away with the notion of hardsect_size") from the block tree interacting
> > with commit 131e4477401ae76a9cbe8539e4b7819e04cfba36 ("md: raid0: chunk
> > size check in raid0_run") from the md tree.
> 
> Martin, this is starting to look like a disaster :-(

So, is anything happening about these?  I still get these (and the dm)
build failures.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: md tree build failure

[Martin K. Petersen]

>>>>> "Stephen" == Stephen Rothwell <sfr@canb.auug.org.au> writes:

>> > Caused by commit e1defc4ff0cf57aca6c5e3ff99fa503f5943c1f1 ("block:
>> > Do away with the notion of hardsect_size") from the block tree
>> > interacting with commit 131e4477401ae76a9cbe8539e4b7819e04cfba36
>> > ("md: raid0: chunk size check in raid0_run") from the md tree.

Stephen> So, is anything happening about these?  I still get these (and
Stephen> the dm) build failures.

There's a replacement DM patch kit brewing that will hopefully come your
way shortly.  It replaces the patches currently in Alasdair's tree.
Mike sent the kit out for review last week and I'm currently testing it.


I don't know what Neil's plans are.  Neil: Do you want to rebase your
tree, fix up the conflicting patches or how would you like to handle
this?

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: linux-next: md tree build failure

[NeilBrown]

On Mon, June 1, 2009 3:13 pm, Martin K. Petersen wrote:
>>>>>> "Stephen" == Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>>> > Caused by commit e1defc4ff0cf57aca6c5e3ff99fa503f5943c1f1 ("block:
>>> > Do away with the notion of hardsect_size") from the block tree
>>> > interacting with commit 131e4477401ae76a9cbe8539e4b7819e04cfba36
>>> > ("md: raid0: chunk size check in raid0_run") from the md tree.
>
> Stephen> So, is anything happening about these?  I still get these (and
> Stephen> the dm) build failures.
>
> There's a replacement DM patch kit brewing that will hopefully come your
> way shortly.  It replaces the patches currently in Alasdair's tree.
> Mike sent the kit out for review last week and I'm currently testing it.
>
>
> I don't know what Neil's plans are.  Neil: Do you want to rebase your
> tree, fix up the conflicting patches or how would you like to handle
> this?

I'm happy to rebase on something if you have a tree that doesn't have too
much more than the changes that are causing conflicts.
Then I'll fix my patches so they work on that tree.

What should I pull??

NeilBrown

Re: linux-next: md tree build failure

[Neil Brown]

On Wednesday June 3, martin.petersen@oracle.com wrote:
> 
> James often rebases against Jens' tree because there's frequently
> dependencies between between block and SCSI during the merge.  I suggest
> you do the same.

OK, I've just rebased my for-next tree against Jens' for-next, and
fixed the compile error with this incremental patch

--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -240,7 +240,7 @@ static int create_strip_zones(mddev_t *mddev)
         * now since we have the hard sector sizes, we can make sure
         * chunk size is a multiple of that sector size
         */
-       if (mddev->chunk_size % mddev->queue->hardsect_size) {
+       if (mddev->chunk_size % queue_logical_block_size(mddev->queue)) {
                printk(KERN_ERR "%s chunk_size of %d not valid\n",
                       mdname(mddev),
                       mddev->chunk_size);


I assume that is the preferred usage?

Thanks,
NeilBrown

Re: linux-next: md tree build failure

[Martin K. Petersen]

>>>>> "Neil" == Neil Brown <neilb@suse.de> writes:

Neil> OK, I've just rebased my for-next tree against Jens' for-next, and
Neil> fixed the compile error with this incremental patch

Excellent - thanks for doing this!


Neil> - if (mddev->chunk_size % mddev->queue->hardsect_size) {
Neil> + if (mddev->chunk_size % queue_logical_block_size(mddev->queue))

Neil> I assume that is the preferred usage?

Yup.

-- 
Martin K. Petersen	Oracle Linux Engineering