lkml.org 
[lkml]   [2007]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/13] the aoeminor doesn't need a long format
    Date
    The aoedev aoeminor member doesn't need a long format.

    Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
    ---
    drivers/block/aoe/aoeblk.c | 7 ++++---
    drivers/block/aoe/aoecmd.c | 5 +++--
    2 files changed, 7 insertions(+), 5 deletions(-)

    diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
    index 98ab170..b78a8ef 100644
    --- a/drivers/block/aoe/aoeblk.c
    +++ b/drivers/block/aoe/aoeblk.c
    @@ -203,7 +203,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);
    @@ -256,14 +256,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;
    }
    diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
    index e92d885..bcea36c 100644
    --- a/drivers/block/aoe/aoecmd.c
    +++ b/drivers/block/aoe/aoecmd.c
    @@ -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)
    --
    1.5.3.4


    \
     
     \ /
      Last update: 2007-12-07 18:57    [W:0.026 / U:0.812 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site