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>
This commit is contained in:
parent
1b86fda9ad
commit
b21faa25c6
4 changed files with 10 additions and 17 deletions
|
@ -75,18 +75,14 @@ enum {
|
||||||
DEVFL_UP = 1, /* device is installed in system and ready for AoE->ATA commands */
|
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_TKILL = (1<<1), /* flag for timer to know when to kill self */
|
||||||
DEVFL_EXT = (1<<2), /* device accepts lba48 commands */
|
DEVFL_EXT = (1<<2), /* device accepts lba48 commands */
|
||||||
DEVFL_CLOSEWAIT = (1<<3), /* device is waiting for all closes to revalidate */
|
DEVFL_GDALLOC = (1<<3), /* need to alloc gendisk */
|
||||||
DEVFL_GDALLOC = (1<<4), /* need to alloc gendisk */
|
DEVFL_KICKME = (1<<4), /* slow polling network card catch */
|
||||||
DEVFL_KICKME = (1<<5), /* slow polling network card catch */
|
DEVFL_NEWSIZE = (1<<5), /* need to update dev size in block layer */
|
||||||
DEVFL_NEWSIZE = (1<<6), /* need to update dev size in block layer */
|
|
||||||
|
|
||||||
BUFFL_FAIL = 1,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
DEFAULTBCNT = 2 * 512, /* 2 sectors */
|
DEFAULTBCNT = 2 * 512, /* 2 sectors */
|
||||||
NPERSHELF = 16, /* number of slots per shelf address */
|
NPERSHELF = 16, /* number of slots per shelf address */
|
||||||
FREETAG = -1,
|
|
||||||
MIN_BUFS = 16,
|
MIN_BUFS = 16,
|
||||||
NTARGETS = 8,
|
NTARGETS = 8,
|
||||||
NAOEIFS = 8,
|
NAOEIFS = 8,
|
||||||
|
|
|
@ -174,6 +174,7 @@ aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp
|
||||||
break;
|
break;
|
||||||
case MINOR_FLUSH:
|
case MINOR_FLUSH:
|
||||||
ret = aoedev_flush(buf, cnt);
|
ret = aoedev_flush(buf, cnt);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
ret = cnt;
|
ret = cnt;
|
||||||
|
|
|
@ -284,7 +284,6 @@ aoecmd_ata_rw(struct aoedev *d)
|
||||||
struct aoe_hdr *h;
|
struct aoe_hdr *h;
|
||||||
struct aoe_atahdr *ah;
|
struct aoe_atahdr *ah;
|
||||||
struct buf *buf;
|
struct buf *buf;
|
||||||
struct bio_vec *bv;
|
|
||||||
struct aoetgt *t;
|
struct aoetgt *t;
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
struct sk_buff_head queue;
|
struct sk_buff_head queue;
|
||||||
|
@ -301,7 +300,6 @@ aoecmd_ata_rw(struct aoedev *d)
|
||||||
if (f == NULL)
|
if (f == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
t = *d->tgt;
|
t = *d->tgt;
|
||||||
bv = buf->bv;
|
|
||||||
bcnt = d->maxbcnt;
|
bcnt = d->maxbcnt;
|
||||||
if (bcnt == 0)
|
if (bcnt == 0)
|
||||||
bcnt = DEFAULTBCNT;
|
bcnt = DEFAULTBCNT;
|
||||||
|
@ -788,28 +786,25 @@ void
|
||||||
aoecmd_sleepwork(struct work_struct *work)
|
aoecmd_sleepwork(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct aoedev *d = container_of(work, struct aoedev, work);
|
struct aoedev *d = container_of(work, struct aoedev, work);
|
||||||
|
struct block_device *bd;
|
||||||
|
u64 ssize;
|
||||||
|
|
||||||
if (d->flags & DEVFL_GDALLOC)
|
if (d->flags & DEVFL_GDALLOC)
|
||||||
aoeblk_gdalloc(d);
|
aoeblk_gdalloc(d);
|
||||||
|
|
||||||
if (d->flags & DEVFL_NEWSIZE) {
|
if (d->flags & DEVFL_NEWSIZE) {
|
||||||
struct block_device *bd;
|
|
||||||
unsigned long flags;
|
|
||||||
u64 ssize;
|
|
||||||
|
|
||||||
ssize = get_capacity(d->gd);
|
ssize = get_capacity(d->gd);
|
||||||
bd = bdget_disk(d->gd, 0);
|
bd = bdget_disk(d->gd, 0);
|
||||||
|
|
||||||
if (bd) {
|
if (bd) {
|
||||||
mutex_lock(&bd->bd_inode->i_mutex);
|
mutex_lock(&bd->bd_inode->i_mutex);
|
||||||
i_size_write(bd->bd_inode, (loff_t)ssize<<9);
|
i_size_write(bd->bd_inode, (loff_t)ssize<<9);
|
||||||
mutex_unlock(&bd->bd_inode->i_mutex);
|
mutex_unlock(&bd->bd_inode->i_mutex);
|
||||||
bdput(bd);
|
bdput(bd);
|
||||||
}
|
}
|
||||||
spin_lock_irqsave(&d->lock, flags);
|
spin_lock_irq(&d->lock);
|
||||||
d->flags |= DEVFL_UP;
|
d->flags |= DEVFL_UP;
|
||||||
d->flags &= ~DEVFL_NEWSIZE;
|
d->flags &= ~DEVFL_NEWSIZE;
|
||||||
spin_unlock_irqrestore(&d->lock, flags);
|
spin_unlock_irq(&d->lock);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,8 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
|
||||||
default:
|
default:
|
||||||
if (h->cmd >= AOECMD_VEND_MIN)
|
if (h->cmd >= AOECMD_VEND_MIN)
|
||||||
break; /* don't complain about vendor commands */
|
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)
|
if (!skb)
|
||||||
|
|
Loading…
Reference in a new issue