WorkStruct: make allyesconfig

[net-next-2.6.git] / drivers / block / aoe / aoe.h

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 1cec19986c40eafc08d8b692b5ead920587c1fad..2308e83e5f33aff25297a2ef7ad3363a56a645ef 100644 (file)
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
-#define VERSION "22"
+#define VERSION "32"
 #define AOE_MAJOR 152
 #define DEVICE_NAME "aoe"
 
@@ -79,6 +79,7 @@ enum {
        DEVFL_PAUSE = (1<<5),
        DEVFL_NEWSIZE = (1<<6), /* need to update dev size in block layer */
        DEVFL_MAXBCNT = (1<<7), /* d->maxbcnt is not changeable */
+       DEVFL_KICKME = (1<<8),
 
        BUFFL_FAIL = 1,
 };
@@ -120,8 +121,10 @@ struct aoedev {
        ulong sysminor;
        ulong aoemajor;
        ulong aoeminor;
-       ulong nopen;            /* (bd_openers isn't available without sleeping) */
-       ulong rttavg;           /* round trip average of requests/responses */
+       u16 nopen;              /* (bd_openers isn't available without sleeping) */
+       u16 lasttag;            /* last tag sent */
+       u16 rttavg;             /* round trip average of requests/responses */
+       u16 mintimer;
        u16 fw_ver;             /* version of blade's firmware */
        u16 maxbcnt;
        struct work_struct work;/* disk create work struct */
@@ -137,7 +140,6 @@ struct aoedev {
        mempool_t *bufpool;     /* for deadlock-free Buf allocation */
        struct list_head bufq;  /* queue of bios to work on */
        struct buf *inprocess;  /* the one we're currently working on */
-       ulong lasttag;          /* last tag sent */
        ushort lostjumbo;
        ushort nframes;         /* number of frames below */
        struct frame *frames;
@@ -157,7 +159,7 @@ void aoecmd_work(struct aoedev *d);
 void aoecmd_cfg(ushort aoemajor, unsigned char aoeminor);
 void aoecmd_ata_rsp(struct sk_buff *);
 void aoecmd_cfg_rsp(struct sk_buff *);
-void aoecmd_sleepwork(void *vp);
+void aoecmd_sleepwork(struct work_struct *);
 struct sk_buff *new_skb(ulong);
 
 int aoedev_init(void);