Re: linux-next: Tree for July 21 (drivers/md/dm-raid)

Re: linux-next: Tree for July 21 (drivers/md/dm-raid)

[Randy Dunlap]

On Thu, 21 Jul 2011 16:55:42 +1000 Stephen Rothwell wrote:

> Hi all,

When CONFIG_DM_RAID=m and CONFIG_MD_RAID1 is not enabled:

ERROR: "md_raid1_congested" [drivers/md/dm-raid.ko] undefined!

due to:

	if (rs->raid_type->level == 1)
		return md_raid1_congested(&rs->md, bits);

Should that just be surrounded with this?

#if defined(CONFIG_MD_RAID1) || defined(CONFIG_MD_RAID1_MODULE)
...
#endif

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: linux-next: Tree for July 21 (drivers/md/dm-raid)

[NeilBrown]

On Thu, 21 Jul 2011 14:56:48 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:

> On Thu, 21 Jul 2011 16:55:42 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> 
> When CONFIG_DM_RAID=m and CONFIG_MD_RAID1 is not enabled:
> 
> ERROR: "md_raid1_congested" [drivers/md/dm-raid.ko] undefined!
> 
> due to:
> 
> 	if (rs->raid_type->level == 1)
> 		return md_raid1_congested(&rs->md, bits);
> 
> Should that just be surrounded with this?
> 
> #if defined(CONFIG_MD_RAID1) || defined(CONFIG_MD_RAID1_MODULE)
> ...
> #endif
> 
> ---
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***


I suspect the right thing to do is add
   select MD_RAID1
to the 
   config DM_RAID

stanza.  What do you think Jon?

NeilBrown

Re: [dm-devel] linux-next: Tree for July 21 (drivers/md/dm-raid)

[Alasdair G Kergon]

On Fri, Jul 22, 2011 at 08:10:40AM +1000, Neil Brown wrote:
> I suspect the right thing to do is add
>    select MD_RAID1
> to the 
>    config DM_RAID
 
Indeed - done.

Alasdair

[PATCH -next] dm: fix dm-flakey printk warning

[Randy Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Fix printk format warning for sector_t, which can be (unsigned)
long or long long.

drivers/md/dm-flakey.c:257: warning: format '%lu' expects type 'long unsigned int', but argument 7 has type 'sector_t'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 drivers/md/dm-flakey.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- linux-next-20110721.orig/drivers/md/dm-flakey.c
+++ linux-next-20110721/drivers/md/dm-flakey.c
@@ -255,10 +255,11 @@ static void corrupt_bio_data(struct bio 
 		data[fc->corrupt_bio_byte - 1] = fc->corrupt_bio_value;
 
 		DMDEBUG("Corrupting data bio=%p by writing %u to byte %u "
-			"(rw=%c bi_rw=%lu bi_sector=%lu cur_bytes=%u)\n",
+			"(rw=%c bi_rw=%lu bi_sector=%llu cur_bytes=%u)\n",
 			bio, fc->corrupt_bio_value, fc->corrupt_bio_byte,
 			(bio_data_dir(bio) == WRITE) ? 'w' : 'r',
-			bio->bi_rw, bio->bi_sector, bio_bytes);
+			bio->bi_rw, (unsigned long long)bio->bi_sector,
+			bio_bytes);
 	}
 }
 

Re: [dm-devel] [PATCH -next] dm: fix dm-flakey printk warning

[Alasdair G Kergon]

On Thu, Jul 21, 2011 at 04:10:47PM -0700, Randy Dunlap wrote:
> Fix printk format warning for sector_t, which can be (unsigned)
> long or long long.
 
Folded, thanks.

Alasdair