lkml.org 
[lkml]   [2016]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 30/72] scsi: zfcp: spin_lock_irqsave() is not nestable
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit e7cb08e894a0b876443ef8fdb0706575dc00a5d2 upstream.

    We accidentally overwrite the original saved value of "flags" so that we
    can't re-enable IRQs at the end of the function. Presumably this
    function is mostly called with IRQs disabled or it would be obvious in
    testing.

    Fixes: aceeffbb59bb ("zfcp: trace full payload of all SAN records (req,resp,iels)")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/s390/scsi/zfcp_dbf.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
    index 589db1db6dd2..371aed75eb83 100644
    --- a/drivers/s390/scsi/zfcp_dbf.c
    +++ b/drivers/s390/scsi/zfcp_dbf.c
    @@ -384,7 +384,7 @@ void zfcp_dbf_san(char *tag, struct zfcp_dbf *dbf,
    /* if (len > rec_len):
    * dump data up to cap_len ignoring small duplicate in rec->payload
    */
    - spin_lock_irqsave(&dbf->pay_lock, flags);
    + spin_lock(&dbf->pay_lock);
    memset(payload, 0, sizeof(*payload));
    memcpy(payload->area, paytag, ZFCP_DBF_TAG_LEN);
    payload->fsf_req_id = req_id;
    --
    2.10.2
    \
     
     \ /
      Last update: 2016-11-07 14:20    [W:3.755 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site