fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index c05ee8b..478489c 100644 (file)
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc.  See COPYING for GPL terms. */
+/* Copyright (c) 2006 Coraid, Inc.  See COPYING for GPL terms. */
 /*
  * aoeblk.c
  * block device routines
@@ -12,9 +12,8 @@
 #include <linux/netdevice.h>
 #include "aoe.h"
 
-static kmem_cache_t *buf_pool_cache;
+static struct kmem_cache *buf_pool_cache;
 
-/* add attributes for our block devices in sysfs */
 static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
 {
        struct aoedev *d = disk->private_data;
@@ -22,7 +21,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)
 {
@@ -62,21 +63,27 @@ static struct disk_attribute disk_attr_fwver = {
        .show = aoedisk_show_fwver
 };
 
-static void
+static struct attribute *aoe_attrs[] = {
+       &disk_attr_state.attr,
+       &disk_attr_mac.attr,
+       &disk_attr_netif.attr,
+       &disk_attr_fwver.attr,
+       NULL
+};
+
+static const struct attribute_group attr_group = {
+       .attrs = aoe_attrs,
+};
+
+static int
 aoedisk_add_sysfs(struct aoedev *d)
 {
-       sysfs_create_file(&d->gd->kobj, &disk_attr_state.attr);
-       sysfs_create_file(&d->gd->kobj, &disk_attr_mac.attr);
-       sysfs_create_file(&d->gd->kobj, &disk_attr_netif.attr);
-       sysfs_create_file(&d->gd->kobj, &disk_attr_fwver.attr);
+       return sysfs_create_group(&d->gd->kobj, &attr_group);
 }
 void
 aoedisk_rm_sysfs(struct aoedev *d)
 {
-       sysfs_remove_link(&d->gd->kobj, "state");
-       sysfs_remove_link(&d->gd->kobj, "mac");
-       sysfs_remove_link(&d->gd->kobj, "netif");
-       sysfs_remove_link(&d->gd->kobj, "firmware-version");
+       sysfs_remove_group(&d->gd->kobj, &attr_group);
 }
 
 static int
@@ -107,8 +114,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) {
                spin_unlock_irqrestore(&d->lock, flags);
                aoecmd_cfg(d->aoemajor, d->aoeminor);
                return 0;
@@ -131,8 +137,7 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
        d = bio->bi_bdev->bd_disk->private_data;
        buf = mempool_alloc(d->bufpool, GFP_NOIO);
        if (buf == NULL) {
-               printk(KERN_INFO "aoe: aoeblk_make_request: buf allocation "
-                       "failure\n");
+               printk(KERN_INFO "aoe: buf allocation failure\n");
                bio_endio(bio, bio->bi_size, -ENOMEM);
                return 0;
        }
@@ -142,14 +147,15 @@ aoeblk_make_request(request_queue_t *q, struct bio *bio)
        buf->bio = bio;
        buf->resid = bio->bi_size;
        buf->sector = bio->bi_sector;
-       buf->bv = buf->bio->bi_io_vec;
+       buf->bv = &bio->bi_io_vec[bio->bi_idx];
+       WARN_ON(buf->bv->bv_len == 0);
        buf->bv_resid = buf->bv->bv_len;
        buf->bufaddr = page_address(buf->bv->bv_page) + buf->bv->bv_offset;
 
        spin_lock_irqsave(&d->lock, flags);
 
        if ((d->flags & DEVFL_UP) == 0) {
-               printk(KERN_INFO "aoe: aoeblk_make_request: device %ld.%ld is not up\n",
+               printk(KERN_INFO "aoe: device %ld.%ld is not up\n",
                        d->aoemajor, d->aoeminor);
                spin_unlock_irqrestore(&d->lock, flags);
                mempool_free(buf, d->bufpool);
@@ -158,14 +164,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;
 }
 
@@ -175,7 +181,7 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
        struct aoedev *d = bdev->bd_disk->private_data;
 
        if ((d->flags & DEVFL_UP) == 0) {
-               printk(KERN_ERR "aoe: aoeblk_ioctl: disk not up\n");
+               printk(KERN_ERR "aoe: disk not up\n");
                return -ENODEV;
        }
 
@@ -202,23 +208,21 @@ aoeblk_gdalloc(void *vp)
 
        gd = alloc_disk(AOE_PARTITIONS);
        if (gd == NULL) {
-               printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate disk "
-                       "structure for %ld.%ld\n", d->aoemajor, d->aoeminor);
+               printk(KERN_ERR "aoe: 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;
        }
 
-       d->bufpool = mempool_create(MIN_BUFS,
-                                   mempool_alloc_slab, mempool_free_slab,
-                                   buf_pool_cache);
+       d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
        if (d->bufpool == NULL) {
-               printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate bufpool "
-                       "for %ld.%ld\n", d->aoemajor, d->aoeminor);
+               printk(KERN_ERR "aoe: cannot allocate bufpool 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 +239,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