WorkStruct: make allyesconfig

[deliverable/linux.git] / drivers / block / aoe / aoedev.c

diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index f51d87bbb5018316c2aef0ac277d4334babba7d9..05a97197c9181899ab7a23ca26db34082f2394b7 100644 (file)
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -88,7 +88,7 @@ aoedev_newdev(ulong nframes)
                        kfree(d);
                return NULL;
        }
-       INIT_WORK(&d->work, aoecmd_sleepwork, d);
+       INIT_WORK(&d->work, aoecmd_sleepwork);
        spin_lock_init(&d->lock);
        init_timer(&d->timer);
        d->timer.data = (ulong) d;
@@ -121,6 +121,7 @@ aoedev_downdev(struct aoedev *d)
                        mempool_free(buf, d->bufpool);
                        bio_endio(bio, bio->bi_size, -EIO);
                }
+               skb_shinfo(f->skb)->nr_frags = f->skb->data_len = 0;
        }
        d->inprocess = NULL;
 
@@ -155,7 +156,7 @@ aoedev_by_sysminor_m(ulong sysminor, ulong bufcnt)
                d = aoedev_newdev(bufcnt);
                if (d == NULL) {
                        spin_unlock_irqrestore(&devlist_lock, flags);
-                       iprintk("aoedev_newdev failure.\n");
+                       printk(KERN_INFO "aoe: aoedev_newdev failure.\n");
                        return NULL;
                }
                d->sysminor = sysminor;