[PATCH 2/2] cciss:fix regression firmware not displayed in procfs (again and again) - Kernel

This is a discussion on [PATCH 2/2] cciss:fix regression firmware not displayed in procfs (again and again) - Kernel ; Patch 2 of 2 Sorry for the delay. I've been out of the office and the network has been down since before lunch CDT. This regression was introduced by commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40. This patch fixes a regression where the controller firmware ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [PATCH 2/2] cciss:fix regression firmware not displayed in procfs (again and again)

  1. [PATCH 2/2] cciss:fix regression firmware not displayed in procfs (again and again)

    Patch 2 of 2

    Sorry for the delay. I've been out of the office and the network has been
    down since before lunch CDT. This regression was introduced by commit
    6ae5ce8e8d4de666f31286808d2285aa6a50fa40.
    This patch fixes a regression where the controller firmware version is not
    displayed in procfs. The previous patch would be called anytime something
    changed. This will get called only once for each controller.

    In this patch I again initialize *inq_buff to NULL per Tomo's comments. I
    also use a goto clean 4 instead of returning -ENOMEM if the kzalloc fails.

    I hope this finally meets everyones expectations.

    Please consider this for inclusion.

    Signed-off-by: Mike Miller

    diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
    index 0f367b1..eb68f39 100644
    --- a/drivers/block/cciss.c
    +++ b/drivers/block/cciss.c
    @@ -3404,7 +3404,8 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
    int i;
    int j = 0;
    int rc;
    - int dac;
    + int dac, return_code;
    + InquiryData_struct *inq_buff = NULL;

    i = alloc_cciss_hba();
    if (i < 0)
    @@ -3510,6 +3511,25 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
    /* Turn the interrupts on so we can service requests */
    hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON);

    + /* Get the firmware version */
    + inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
    + if (inq_buff == NULL) {
    + printk(KERN_ERR "cciss: out of memory\n");
    + goto clean4;
    + }
    +
    + return_code = sendcmd_withirq(CISS_INQUIRY, i, inq_buff,
    + sizeof(InquiryData_struct), 0, 0 , 0, TYPE_CMD);
    + if (return_code == IO_OK) {
    + hba[i]->firm_ver[0] = inq_buff->data_byte[32];
    + hba[i]->firm_ver[1] = inq_buff->data_byte[33];
    + hba[i]->firm_ver[2] = inq_buff->data_byte[34];
    + hba[i]->firm_ver[3] = inq_buff->data_byte[35];
    + } else { /* send command failed */
    + printk(KERN_WARNING "cciss: unable to determine firmware"
    + " version of controller\n");
    + }
    +
    cciss_procinit(i);

    hba[i]->cciss_max_sectors = 2048;
    @@ -3520,6 +3540,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
    return 1;

    clean4:
    + kfree(inq_buff);
    #ifdef CONFIG_CISS_SCSI_TAPE
    kfree(hba[i]->scsi_rejects.complete);
    #endif
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. RE: [PATCH 2/2] cciss:fix regression firmware not displayed in procfs (again and again)



    > -----Original Message-----
    > From: Andrew Morton [mailto:akpm@linux-foundation.org]
    > Sent: Tuesday, October 21, 2008 5:44 PM
    > To: Miller, Mike (OS Dev)
    > Cc: jens.axboe@oracle.com; linux-kernel@vger.kernel.org;
    > linux-scsi@vger.kernel.org; fujita.tomonori@lab.ntt.co.jp;
    > adobriyan@gmail.com
    > Subject: Re: [PATCH 2/2] cciss:fix regression firmware not
    > displayed in procfs (again and again)
    >
    > On Tue, 21 Oct 2008 16:23:22 -0500
    > Mike Miller wrote:
    >
    > > Patch 2 of 2

    >
    > What happened with "1 of 2"?


    Andrew,
    That was the patch to fix the sysfs symlink. You merged it and then superceded with my later patch.

    --- snip -----

    The patch titled
    cciss: fix sysfs regression
    has been removed from the -mm tree. Its filename was
    cciss-fix-sysfs-regression.patch

    This patch was dropped because an updated version will be merged

    The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

    ------------------------------------------------------
    Subject: cciss: fix sysfs regression
    From: Mike Miller

    Fix a broken symlink in sysfs.

    Signed-off-by: Mike Miller
    Cc: Jens Axboe
    Signed-off-by: Andrew Morton
    ---

    drivers/block/cciss.c | 1 +
    1 file changed, 1 insertion(+)

    diff -puN drivers/block/cciss.c~cciss-fix-sysfs-regression drivers/block/cciss.c
    --- a/drivers/block/cciss.c~cciss-fix-sysfs-regression
    +++ a/drivers/block/cciss.c
    @@ -1365,6 +1365,7 @@ static void cciss_add_disk(ctlr_info_t *
    disk->first_minor = drv_index << NWD_SHIFT;
    disk->fops = &cciss_fops;
    disk->private_data = &h->drv[drv_index];
    + disk->driverfs_dev = &h->pdev->dev;

    /* Set up queue information */
    blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask); _

    Patches currently in -mm which might be from mike.miller@hp.com are

    origin.patch
    cciss-fix-sysfs-regression.patch

    ----snip-----

    Actually, this looks like the right one.

    -- mikem

    >
    > > Sorry for the delay. I've been out of the office and the

    > network has
    > > been down since before lunch CDT. This regression was introduced by
    > > commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40.
    > > This patch fixes a regression where the controller firmware

    > version is
    > > not displayed in procfs. The previous patch would be called anytime
    > > something changed. This will get called only once for each

    > controller.
    > >
    > > In this patch I again initialize *inq_buff to NULL per Tomo's
    > > comments. I also use a goto clean 4 instead of returning

    > -ENOMEM if the kzalloc fails.
    > >
    > > I hope this finally meets everyones expectations.
    > >
    > > Please consider this for inclusion.
    > >
    > > Signed-off-by: Mike Miller

    >
    > So this fix is needed in 2.6.27.x, yes?
    >

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread