Commit fbbef0da authored by Daniel Wagner's avatar Daniel Wagner Committed by Martin K. Petersen

scsi: qedf: Simplify mutex_unlock() usage

The commit 6d1368e8 ("scsi: qedf: fixup locking in
qedf_restart_rport()") introduced the lock. Though the lock protects
only the fc_rport_create() call. Thus, we can move the mutex unlock up
before the if statement and drop the else body.

Link: https://lore.kernel.org/r/20200403092717.19779-1-dwagner@suse.de
Cc: Hannes Reinecke <hare@suse.com>
Cc: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4e2dec66
...@@ -388,14 +388,10 @@ void qedf_restart_rport(struct qedf_rport *fcport) ...@@ -388,14 +388,10 @@ void qedf_restart_rport(struct qedf_rport *fcport)
mutex_lock(&lport->disc.disc_mutex); mutex_lock(&lport->disc.disc_mutex);
/* Recreate the rport and log back in */ /* Recreate the rport and log back in */
rdata = fc_rport_create(lport, port_id); rdata = fc_rport_create(lport, port_id);
if (rdata) {
mutex_unlock(&lport->disc.disc_mutex); mutex_unlock(&lport->disc.disc_mutex);
if (rdata)
fc_rport_login(rdata); fc_rport_login(rdata);
fcport->rdata = rdata; fcport->rdata = rdata;
} else {
mutex_unlock(&lport->disc.disc_mutex);
fcport->rdata = NULL;
}
} }
clear_bit(QEDF_RPORT_IN_RESET, &fcport->flags); clear_bit(QEDF_RPORT_IN_RESET, &fcport->flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment