* [PATCH v2] scsi: qedf: Simplify mutex_unlock() usage
@ 2020-04-03 9:27 Daniel Wagner
2020-04-14 1:16 ` Martin K. Petersen
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Wagner @ 2020-04-03 9:27 UTC (permalink / raw)
To: linux-scsi; +Cc: Daniel Wagner, Hannes Reinecke, Saurav Kashyap
The commit 6d1368e8f987 ("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.
Cc: Hannes Reinecke <hare@suse.com>
Cc: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
changes since v1:
- refactor the fcport->rdata assignemnt.
drivers/scsi/qedf/qedf_els.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/qedf/qedf_els.c b/drivers/scsi/qedf/qedf_els.c
index 87e169dcebdb..542ba9454257 100644
--- a/drivers/scsi/qedf/qedf_els.c
+++ b/drivers/scsi/qedf/qedf_els.c
@@ -388,14 +388,10 @@ void qedf_restart_rport(struct qedf_rport *fcport)
mutex_lock(&lport->disc.disc_mutex);
/* Recreate the rport and log back in */
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);
- fcport->rdata = rdata;
- } else {
- mutex_unlock(&lport->disc.disc_mutex);
- fcport->rdata = NULL;
- }
+ fcport->rdata = rdata;
}
clear_bit(QEDF_RPORT_IN_RESET, &fcport->flags);
}
--
2.26.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] scsi: qedf: Simplify mutex_unlock() usage
2020-04-03 9:27 [PATCH v2] scsi: qedf: Simplify mutex_unlock() usage Daniel Wagner
@ 2020-04-14 1:16 ` Martin K. Petersen
0 siblings, 0 replies; 2+ messages in thread
From: Martin K. Petersen @ 2020-04-14 1:16 UTC (permalink / raw)
To: Daniel Wagner; +Cc: linux-scsi, Hannes Reinecke, Saurav Kashyap
Daniel,
> The commit 6d1368e8f987 ("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.
Applied to 5.8/scsi-queue, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-14 1:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-03 9:27 [PATCH v2] scsi: qedf: Simplify mutex_unlock() usage Daniel Wagner
2020-04-14 1:16 ` Martin K. Petersen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.