Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d75981a authored by Ed L. Cashin's avatar Ed L. Cashin Committed by Linus Torvalds
Browse files

aoe: the aoeminor doesn't need a long format 



The aoedev aoeminor member doesn't need a long format.

Signed-off-by: default avatarEd L. Cashin <ecashin@coraid.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7df620d8

drivers/block/aoe/aoeblk.c

+4 −3
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio) 
	spin_lock_irqsave(&d->lock, flags);



	if ((d->flags & DEVFL_UP) == 0) {

		printk(KERN_INFO "aoe: device %ld.%ld is not up\n",

		printk(KERN_INFO "aoe: device %ld.%d is not up\n",

			d->aoemajor, d->aoeminor);

		spin_unlock_irqrestore(&d->lock, flags);

		mempool_free(buf, d->bufpool);
@@ -255,14 +255,15 @@ aoeblk_gdalloc(void *vp) 


	gd = alloc_disk(AOE_PARTITIONS);

	if (gd == NULL) {

		printk(KERN_ERR "aoe: cannot allocate disk structure for %ld.%ld\n",

		printk(KERN_ERR

			"aoe: cannot allocate disk structure for %ld.%d\n",

			d->aoemajor, d->aoeminor);

		goto err;

	}



	d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);

	if (d->bufpool == NULL) {

		printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%ld\n",

		printk(KERN_ERR "aoe: cannot allocate bufpool for %ld.%d\n",

			d->aoemajor, d->aoeminor);

		goto err_disk;

	}

drivers/block/aoe/aoecmd.c

+3 −2
Original line number Diff line number Diff line
@@ -697,7 +697,8 @@ ataid_complete(struct aoedev *d, struct aoetgt *t, unsigned char *id) 
	}



	if (d->ssize != ssize)

		printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu sectors\n",

		printk(KERN_INFO

			"aoe: %012llx e%ld.%d v%04x has %llu sectors\n",

			mac_addr(t->addr),

			d->aoemajor, d->aoeminor,

			d->fw_ver, (long long)ssize);
@@ -822,7 +823,7 @@ aoecmd_ata_rsp(struct sk_buff *skb) 


	if (ahin->cmdstat & 0xa9) {	/* these bits cleared on success */

		printk(KERN_ERR

			"aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%ld\n",

			"aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%d\n",

			ahout->cmdstat, ahin->cmdstat,

			d->aoemajor, d->aoeminor);

		if (buf)