aoe: remove unused code and add cosmetic improvements

This change removes some unused code and attempts to increase code
consistency.

Signed-off-by: Ed Cashin <ecashin@coraid.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index dab7258ddb2642ded97fed91575abf4a6658bb7b..eb41fc5499595619f2d9890cc16d2f7d0f84f2d6 100644 (file)
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -75,18 +75,14 @@ enum {
        DEVFL_UP = 1,   /* device is installed in system and ready for AoE->ATA commands */
        DEVFL_TKILL = (1<<1),   /* flag for timer to know when to kill self */
        DEVFL_EXT = (1<<2),     /* device accepts lba48 commands */
-       DEVFL_CLOSEWAIT = (1<<3), /* device is waiting for all closes to revalidate */
-       DEVFL_GDALLOC = (1<<4), /* need to alloc gendisk */
-       DEVFL_KICKME = (1<<5),  /* slow polling network card catch */
-       DEVFL_NEWSIZE = (1<<6), /* need to update dev size in block layer */
-
-       BUFFL_FAIL = 1,
+       DEVFL_GDALLOC = (1<<3), /* need to alloc gendisk */
+       DEVFL_KICKME = (1<<4),  /* slow polling network card catch */
+       DEVFL_NEWSIZE = (1<<5), /* need to update dev size in block layer */
 };
 
 enum {
        DEFAULTBCNT = 2 * 512,  /* 2 sectors */
        NPERSHELF = 16,         /* number of slots per shelf address */
-       FREETAG = -1,
        MIN_BUFS = 16,
        NTARGETS = 8,
        NAOEIFS = 8,

diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index acdd0adaf5da49a468159ce7ddb1a015fe11e5b3..723e60419ed86715001cf49e12aeadebdde395c2 100644 (file)
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -174,6 +174,7 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp
                break;
        case MINOR_FLUSH:
                ret = aoedev_flush(buf, cnt);
+               break;
        }
        if (ret == 0)
                ret = cnt;

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 2f19b9bba913e64f9dd9c66cba03c6e5c1e847a2..6d2a21458b50e1b01ae5d8b11f2264b787f15c10 100644 (file)
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -284,7 +284,6 @@ aoecmd_ata_rw(struct aoedev *d)
        struct aoe_hdr *h;
        struct aoe_atahdr *ah;
        struct buf *buf;
-       struct bio_vec *bv;
        struct aoetgt *t;
        struct sk_buff *skb;
        struct sk_buff_head queue;
@@ -301,7 +300,6 @@ aoecmd_ata_rw(struct aoedev *d)
        if (f == NULL)
                return 0;
        t = *d->tgt;
-       bv = buf->bv;
        bcnt = d->maxbcnt;
        if (bcnt == 0)
                bcnt = DEFAULTBCNT;
@@ -788,28 +786,25 @@ void
 aoecmd_sleepwork(struct work_struct *work)
 {
        struct aoedev *d = container_of(work, struct aoedev, work);
+       struct block_device *bd;
+       u64 ssize;
 
        if (d->flags & DEVFL_GDALLOC)
                aoeblk_gdalloc(d);
 
        if (d->flags & DEVFL_NEWSIZE) {
-               struct block_device *bd;
-               unsigned long flags;
-               u64 ssize;
-
                ssize = get_capacity(d->gd);
                bd = bdget_disk(d->gd, 0);
-
                if (bd) {
                        mutex_lock(&bd->bd_inode->i_mutex);
                        i_size_write(bd->bd_inode, (loff_t)ssize<<9);
                        mutex_unlock(&bd->bd_inode->i_mutex);
                        bdput(bd);
                }
-               spin_lock_irqsave(&d->lock, flags);
+               spin_lock_irq(&d->lock);
                d->flags |= DEVFL_UP;
                d->flags &= ~DEVFL_NEWSIZE;
-               spin_unlock_irqrestore(&d->lock, flags);
+               spin_unlock_irq(&d->lock);
        }
 }
 

diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 5f43710601ab20678d0299b1fc317a8aef273042..3c923e56d535a9a67b318e41d44157fde4b5a3d1 100644 (file)
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -175,7 +175,8 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
        default:
                if (h->cmd >= AOECMD_VEND_MIN)
                        break;  /* don't complain about vendor commands */
-               printk(KERN_INFO "aoe: unknown cmd %d\n", h->cmd);
+               pr_info("aoe: unknown AoE command type 0x%02x\n", h->cmd);
+               break;
        }
 
        if (!skb)