linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / block / aoe / aoeblk.c

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 393b86a..c05ee8b 100644 (file)
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -22,9 +22,7 @@ static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
        return snprintf(page, PAGE_SIZE,
                        "%s%s\n",
                        (d->flags & DEVFL_UP) ? "up" : "down",
-                       (d->flags & DEVFL_PAUSE) ? ",paused" :
-                       (d->nopen && !(d->flags & DEVFL_UP)) ? ",closewait" : "");
-       /* I'd rather see nopen exported so we can ditch closewait */
+                       (d->flags & DEVFL_CLOSEWAIT) ? ",closewait" : "");
 }
 static ssize_t aoedisk_show_mac(struct gendisk * disk, char *page)
 {
@@ -109,7 +107,8 @@ aoeblk_release(struct inode *inode, struct file *filp)
 
        spin_lock_irqsave(&d->lock, flags);
 
-       if (--d->nopen == 0) {
+       if (--d->nopen == 0 && (d->flags & DEVFL_CLOSEWAIT)) {
+               d->flags &= ~DEVFL_CLOSEWAIT;
                spin_unlock_irqrestore(&d->lock, flags);
                aoecmd_cfg(d->aoemajor, d->aoeminor);
                return 0;
@@ -159,14 +158,14 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
        }
 
        list_add_tail(&buf->bufs, &d->bufq);
-
        aoecmd_work(d);
+
        sl = d->sendq_hd;
        d->sendq_hd = d->sendq_tl = NULL;
 
        spin_unlock_irqrestore(&d->lock, flags);
-       aoenet_xmit(sl);
 
+       aoenet_xmit(sl);
        return 0;
 }
 
@@ -206,18 +205,20 @@ aoeblk_gdalloc(void *vp)
                printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate disk "
                        "structure for %ld.%ld\n", d->aoemajor, d->aoeminor);
                spin_lock_irqsave(&d->lock, flags);
-               d->flags &= ~DEVFL_GDALLOC;
+               d->flags &= ~DEVFL_WORKON;
                spin_unlock_irqrestore(&d->lock, flags);
                return;
        }
 
-       d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
+       d->bufpool = mempool_create(MIN_BUFS,
+                                   mempool_alloc_slab, mempool_free_slab,
+                                   buf_pool_cache);
        if (d->bufpool == NULL) {
                printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate bufpool "
                        "for %ld.%ld\n", d->aoemajor, d->aoeminor);
                put_disk(gd);
                spin_lock_irqsave(&d->lock, flags);
-               d->flags &= ~DEVFL_GDALLOC;
+               d->flags &= ~DEVFL_WORKON;
                spin_unlock_irqrestore(&d->lock, flags);
                return;
        }
@@ -234,13 +235,18 @@ aoeblk_gdalloc(void *vp)
 
        gd->queue = &d->blkq;
        d->gd = gd;
-       d->flags &= ~DEVFL_GDALLOC;
+       d->flags &= ~DEVFL_WORKON;
        d->flags |= DEVFL_UP;
 
        spin_unlock_irqrestore(&d->lock, flags);
 
        add_disk(gd);
        aoedisk_add_sysfs(d);
+       
+       printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu "
+               "sectors\n", (unsigned long long)mac_addr(d->addr),
+               d->aoemajor, d->aoeminor,
+               d->fw_ver, (long long)d->ssize);
 }
 
 void