Skip to content

Commit 3e40814

Browse files
ching Huangmartinkpetersen
authored andcommitted
scsi: arcmsr: Fix reading empty buffer length
Fix empty buffer length error which causes ARECA CLI app command timeout. Signed-off-by: ching Huang <ching2048@areca.com.tw> Link: https://lore.kernel.org/r/4aec4385abc6eab10b575c28130ec615a144492d.camel@areca.com.tw Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent c3e9b93 commit 3e40814

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

drivers/scsi/arcmsr/arcmsr_hba.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,8 +2255,11 @@ static void arcmsr_iop2drv_data_wrote_handle(struct AdapterControlBlock *acb)
22552255

22562256
spin_lock_irqsave(&acb->rqbuffer_lock, flags);
22572257
prbuffer = arcmsr_get_iop_rqbuffer(acb);
2258-
buf_empty_len = (acb->rqbuf_putIndex - acb->rqbuf_getIndex - 1) &
2259-
(ARCMSR_MAX_QBUFFER - 1);
2258+
if (acb->rqbuf_putIndex >= acb->rqbuf_getIndex) {
2259+
buf_empty_len = (ARCMSR_MAX_QBUFFER - 1) -
2260+
(acb->rqbuf_putIndex - acb->rqbuf_getIndex);
2261+
} else
2262+
buf_empty_len = acb->rqbuf_getIndex - acb->rqbuf_putIndex - 1;
22602263
if (buf_empty_len >= readl(&prbuffer->data_len)) {
22612264
if (arcmsr_Read_iop_rqbuffer_data(acb, prbuffer) == 0)
22622265
acb->acb_flags |= ACB_F_IOPDATA_OVERFLOW;

0 commit comments

Comments
 (0)