[PATCH] aoe [2/8]: support dynamic resizing of AoE devices

Allow the driver to recognize AoE devices that have changed size.
Devices not in use are updated automatically, and devices that are in
use are updated at user request.

Signed-off-by: "Ed L. Cashin" <ecashin@coraid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index c05ee8bffd97..039c0911fa8f 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -22,7 +22,9 @@ 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_CLOSEWAIT) ? ",closewait" : "");
+                        (d->flags & DEVFL_PAUSE) ? ",paused" :
+                        (d->nopen && !(d->flags & DEVFL_UP)) ? ",closewait" : "");
+        /* I'd rather see nopen exported so we can ditch closewait */
 }
 static ssize_t aoedisk_show_mac(struct gendisk * disk, char *page)
 {
@@ -107,8 +109,7 @@ aoeblk_release(struct inode *inode, struct file *filp)
 
         spin_lock_irqsave(&d->lock, flags);
 
-        if (--d->nopen == 0 && (d->flags & DEVFL_CLOSEWAIT)) {
-                d->flags &= ~DEVFL_CLOSEWAIT;
+        if (--d->nopen == 0 && !(d->flags & DEVFL_UP)) {
                 spin_unlock_irqrestore(&d->lock, flags);
                 aoecmd_cfg(d->aoemajor, d->aoeminor);
                 return 0;
@@ -158,14 +159,14 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
         }
 
         list_add_tail(&buf->bufs, &d->bufq);
-        aoecmd_work(d);
 
+        aoecmd_work(d);
         sl = d->sendq_hd;
         d->sendq_hd = d->sendq_tl = NULL;
 
         spin_unlock_irqrestore(&d->lock, flags);
-
         aoenet_xmit(sl);
+
         return 0;
 }
 
@@ -205,7 +206,7 @@ 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_WORKON;
+                d->flags &= ~DEVFL_GDALLOC;
                 spin_unlock_irqrestore(&d->lock, flags);
                 return;
         }
@@ -218,7 +219,7 @@ aoeblk_gdalloc(void *vp)
                         "for %ld.%ld\n", d->aoemajor, d->aoeminor);
                 put_disk(gd);
                 spin_lock_irqsave(&d->lock, flags);
-                d->flags &= ~DEVFL_WORKON;
+                d->flags &= ~DEVFL_GDALLOC;
                 spin_unlock_irqrestore(&d->lock, flags);
                 return;
         }
@@ -235,18 +236,13 @@ aoeblk_gdalloc(void *vp)
 
         gd->queue = &d->blkq;
         d->gd = gd;
-        d->flags &= ~DEVFL_WORKON;
+        d->flags &= ~DEVFL_GDALLOC;
         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