diff options
author | James Bottomley <JBottomley@Parallels.com> | 2013-07-13 08:22:56 +0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-07-13 08:22:56 +0400 |
commit | 622f9a8e7b8043a5ea2c7d047d65ecad01fe0f97 (patch) | |
tree | ac8513cb52c074b43daba22407eb61de520afef9 /drivers/scsi/fcoe/fcoe_ctlr.c | |
parent | 655ee63cf3714ac0a7ebee4a7dd00fdc54b006fc (diff) | |
parent | 7a5ed75a782a1f2de7fc773981ecd88bfa7595b1 (diff) |
Merge tag 'fcoe' into for-linus
A short series of fixes to libfc, libfcoe and fcoe.
Most patches fix formatting problems, one changes
the behavior of which discovered ports can/will be
logged into and another fixes a memory leak.
Diffstat (limited to 'drivers/scsi/fcoe/fcoe_ctlr.c')
-rw-r--r-- | drivers/scsi/fcoe/fcoe_ctlr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c index 795843dde8e..203415e0251 100644 --- a/drivers/scsi/fcoe/fcoe_ctlr.c +++ b/drivers/scsi/fcoe/fcoe_ctlr.c @@ -2090,7 +2090,11 @@ static struct fc_rport_operations fcoe_ctlr_vn_rport_ops = { */ static void fcoe_ctlr_disc_stop_locked(struct fc_lport *lport) { + struct fc_rport_priv *rdata; + mutex_lock(&lport->disc.disc_mutex); + list_for_each_entry_rcu(rdata, &lport->disc.rports, peers) + lport->tt.rport_logoff(rdata); lport->disc.disc_callback = NULL; mutex_unlock(&lport->disc.disc_mutex); } |