Skip to content

Commit 7f5dce6

Browse files
Karan Tilak Kumarmartinkpetersen
authored andcommitted
scsi: fnic: Replace fnic->lock_flags with local flags
Replace fnic->lock_flags with local variable for usage with spinlocks in fdls_schedule_oxid_free_retry_work(). Suggested-by: Dan Carpenter <[email protected]> Fixes: a63e78e ("scsi: fnic: Add support for fabric based solicited requests and responses") Reviewed-by: Sesidhar Baddela <[email protected]> Reviewed-by: Arulprabhu Ponnusamy <[email protected]> Reviewed-by: Gian Carlo Boffa <[email protected]> Reviewed-by: Arun Easi <[email protected]> Signed-off-by: Karan Tilak Kumar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent e984fa2 commit 7f5dce6

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/scsi/fnic/fdls_disc.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,23 +308,24 @@ void fdls_schedule_oxid_free_retry_work(struct work_struct *work)
308308
struct fnic *fnic = iport->fnic;
309309
struct reclaim_entry_s *reclaim_entry;
310310
unsigned long delay_j = msecs_to_jiffies(OXID_RECLAIM_TOV(iport));
311+
unsigned long flags;
311312
int idx;
312313

313-
spin_lock_irqsave(&fnic->fnic_lock, fnic->lock_flags);
314+
spin_lock_irqsave(&fnic->fnic_lock, flags);
314315

315316
for_each_set_bit(idx, oxid_pool->pending_schedule_free, FNIC_OXID_POOL_SZ) {
316317

317318
FNIC_FCS_DBG(KERN_INFO, fnic->host, fnic->fnic_num,
318319
"Schedule oxid free. oxid idx: %d\n", idx);
319320

320-
spin_unlock_irqrestore(&fnic->fnic_lock, fnic->lock_flags);
321+
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
321322
reclaim_entry = kzalloc(sizeof(*reclaim_entry), GFP_KERNEL);
322-
spin_lock_irqsave(&fnic->fnic_lock, fnic->lock_flags);
323+
spin_lock_irqsave(&fnic->fnic_lock, flags);
323324

324325
if (!reclaim_entry) {
325326
schedule_delayed_work(&oxid_pool->schedule_oxid_free_retry,
326327
msecs_to_jiffies(SCHEDULE_OXID_FREE_RETRY_TIME));
327-
spin_unlock_irqrestore(&fnic->fnic_lock, fnic->lock_flags);
328+
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
328329
return;
329330
}
330331

@@ -339,7 +340,7 @@ void fdls_schedule_oxid_free_retry_work(struct work_struct *work)
339340
}
340341
}
341342

342-
spin_unlock_irqrestore(&fnic->fnic_lock, fnic->lock_flags);
343+
spin_unlock_irqrestore(&fnic->fnic_lock, flags);
343344
}
344345

345346
static bool fdls_is_oxid_fabric_req(uint16_t oxid)

0 commit comments

Comments
 (0)