diff mbox

[02/12] hpsa: cleanup sas_phy structures in sysfs when unloading

Message ID 150853627417.28275.14954285884974003997.stgit@brunhilda (mailing list archive)
State Accepted
Headers show

Commit Message

Don Brace Oct. 20, 2017, 9:51 p.m. UTC
From: Martin Wilck <mwilck@suse.de>

I am resubmitting this patch on behalf of Martin Wilck
with his permission.

The original patch can be found here:
https://www.spinics.net/lists/linux-scsi/msg102083.html

This patch did not help until Hannes's
commit 9441284fbc39 ("scsi-fixup-kernel-warning-during-rmmod")
was applied to the kernel.

--------------------------------------
Original patch description from Martin:
--------------------------------------

When the hpsa module is unloaded using rmmod, dangling
symlinks remain under /sys/class/sas_phy. Fix this by
calling sas_phy_delete() rather than sas_phy_free (which,
according to comments, should not be called for PHYs that
have been set up successfully, anyway).

Tested-by: Don Brace <don.brace@microsemi.com>
Reviewed-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin Wilck <mwilck@xxxxxxx>
Signed-off-by: Don Brace <don.brace@microsemi.com>
---
 drivers/scsi/hpsa.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Bottomley Oct. 23, 2017, 11:44 p.m. UTC | #1
On Fri, 2017-10-20 at 16:51 -0500, Don Brace wrote:
> From: Martin Wilck <mwilck@suse.de>
> 
> I am resubmitting this patch on behalf of Martin Wilck
> with his permission.
> 
> The original patch can be found here:
> https://www.spinics.net/lists/linux-scsi/msg102083.html
> 
> This patch did not help until Hannes's
> commit 9441284fbc39 ("scsi-fixup-kernel-warning-during-rmmod")
> was applied to the kernel.
> 
> --------------------------------------
> Original patch description from Martin:
> --------------------------------------
> 
> When the hpsa module is unloaded using rmmod, dangling
> symlinks remain under /sys/class/sas_phy. Fix this by
> calling sas_phy_delete() rather than sas_phy_free (which,
> according to comments, should not be called for PHYs that
> have been set up successfully, anyway).
> 
> Tested-by: Don Brace <don.brace@microsemi.com>
> Reviewed-by: Don Brace <don.brace@microsemi.com>
> Signed-off-by: Martin Wilck <mwilck@xxxxxxx>

Hey, what's this for a signoff?  The original patch had the correct
email address; how did it get mangled like this?

James
Don Brace Oct. 24, 2017, 3:08 p.m. UTC | #2
> -----Original Message-----

> On Fri, 2017-10-20 at 16:51 -0500, Don Brace wrote:

> > From: Martin Wilck <mwilck@suse.de>

> >

> > I am resubmitting this patch on behalf of Martin Wilck

> > with his permission.

> >

> > The original patch can be found here:

> > https://www.spinics.net/lists/linux-scsi/msg102083.html

> >

> > This patch did not help until Hannes's

> > commit 9441284fbc39 ("scsi-fixup-kernel-warning-during-rmmod")

> > was applied to the kernel.

> >

> > --------------------------------------

> > Original patch description from Martin:

> > --------------------------------------

> >

> > When the hpsa module is unloaded using rmmod, dangling

> > symlinks remain under /sys/class/sas_phy. Fix this by

> > calling sas_phy_delete() rather than sas_phy_free (which,

> > according to comments, should not be called for PHYs that

> > have been set up successfully, anyway).

> >

> > Tested-by: Don Brace <don.brace@microsemi.com>

> > Reviewed-by: Don Brace <don.brace@microsemi.com>

> > Signed-off-by: Martin Wilck <mwilck@xxxxxxx>

> 

> Hey, what's this for a signoff?  The original patch had the correct

> email address; how did it get mangled like this?

> 

> James


Unsure. I do not see the mangled e-mail anywhere in the e-mail
chain. I did not type the e-mail in like that. But it originated from me.
I may have pulled the patch from an archive that mangled it.

Do you want me to re-post the two patches? 

Thanks,
Don Brace
ESC - Smart Storage
Microsemi Corporation
Martin K. Petersen Oct. 24, 2017, 3:14 p.m. UTC | #3
Don,

> Unsure. I do not see the mangled e-mail anywhere in the e-mail
> chain. I did not type the e-mail in like that. But it originated from
> me.  I may have pulled the patch from an archive that mangled it.
>
> Do you want me to re-post the two patches?

I'll fix them up. But it's a bad time to have to rebase...
diff mbox

Patch

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index aff4a4f..76461c4 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -9207,9 +9207,9 @@  static void hpsa_free_sas_phy(struct hpsa_sas_phy *hpsa_sas_phy)
 	struct sas_phy *phy = hpsa_sas_phy->phy;
 
 	sas_port_delete_phy(hpsa_sas_phy->parent_port->port, phy);
-	sas_phy_free(phy);
 	if (hpsa_sas_phy->added_to_port)
 		list_del(&hpsa_sas_phy->phy_list_entry);
+	sas_phy_delete(phy);
 	kfree(hpsa_sas_phy);
 }