[Aoetools-discuss] aoe6-74 & linux-2.6.34

[Serge L. <ser...@gm...>]

Hello,

Does aoe6-74 work with linux-2.6.34?

I was able to compile it only after the following patch:

--- a/linux/drivers/block/aoe/aoeblk.c       2010-06-06 12:49:22.000000000 -0500
+++ b/linux/drivers/block/aoe/aoeblk.c        2010-06-06 12:51:50.000000000 -0500
@@ -378,7 +378,7 @@
        q->queuedata = d;
        d->gd = gd;
        if (aoe_maxsectors)
-               blk_queue_max_sectors(q, aoe_maxsectors);
+               blk_queue_max_hw_sectors(q, aoe_maxsectors);
        gd->major = AOE_MAJOR;
        gd->first_minor = d->sysminor;
        gd->fops = &aoe_bdops;
--- a/linux/drivers/block/aoe/aoechr.c       2010-06-06 13:00:19.000000000 -0500
+++ b/linux/drivers/block/aoe/aoechr.c    2010-06-06 13:00:59.000000000 -0500
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/smp_lock.h>
+#include <linux/slab.h>
 #include "aoe.h"

 enum {
--- a/linux/drivers/block/aoe/aoemain.c      2010-06-06 13:02:09.000000000 -0500
+++ b/linux/drivers/block/aoe/aoemain.c   2010-06-06 13:02:44.000000000 -0500
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include "aoe.h"

 MODULE_LICENSE("GPL");


Error text:

make -C /data/build/tmp/linux-2.6.34 CONFIG_ATA_OVER_ETH=m
KDIR=/data/build/tmp/linux-2.6.34
SUBDIRS="/data/build/tmp/aoe6-74/linux/drivers/block/aoe" EXTRA_
CFLAGS="-DAOE_PARTITIONS=16 -DDEVSUBDIR='\"etherd\"' -DAOE_DYNDEVS=1" modules
make[1]: Entering directory `/data/build/tmp/linux-2.6.34'
  CC [M]  /data/build/tmp/aoe6-74/linux/drivers/block/aoe/aoeblk.o
  CC [M]  /data/build/tmp/aoe6-74/linux/drivers/block/aoe/aoechr.o
/data/build/tmp/aoe6-74/linux/drivers/block/aoe/aoechr.c: In function
'aoechr_error':
/data/build/tmp/aoe6-74/linux/drivers/block/aoe/aoechr.c:131: error: implicit
declaration of function 'kmalloc'
/data/build/tmp/aoe6-74/linux/drivers/block/aoe/aoechr.c:131: warning:
assignment makes pointer from integer without a cast
/data/build/tmp/aoe6-74/linux/drivers/block/aoe/aoechr.c: In function 'aoechr_read':
/data/build/tmp/aoe6-74/linux/drivers/block/aoe/aoechr.c:256: error: implicit
declaration of function 'kfree'
make[2]: *** [/data/build/tmp/aoe6-74/linux/drivers/block/aoe/aoechr.o] Error 1
make[1]: *** [_module_/data/build/tmp/aoe6-74/linux/drivers/block/aoe] Error 2
make[1]: Leaving directory `/data/build/tmp/linux-2.6.34'
make: *** [linux/drivers/block/aoe/aoe.ko] Error 2



Sincerely,
Serge