leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: libsas: Switch back to original event notifiers API

Browse Source 
libsas event notifiers required an extension where gfp_t flags must be
explicitly passed. For bisectability, a temporary _gfp() variant of such
functions were added. All call sites then got converted use the _gfp()
variants and explicitly pass GFP context. Having no callers left, the
original libsas notifiers were then modified to accept gfp_t flags by
default.

Switch back to the original event notifiers API, while still passing GFP
context.  The _gfp() notifier variants will be removed afterwards.

Link: https://lore.kernel.org/r/20210118100955.1761652-17-a.darwish@linutronix.de
Cc: Jason Yan <yanaijie@huawei.com>
Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Ahmed S. Darwish <a.darwish@linutronix.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Ahmed S. Darwish 2021-01-18 11:09:52 +01:00 committed by Martin K. Petersen
parent de6d7547ce
commit f76d9f1a15
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/libsas/sas_event.c
View File

@ -109,7 +109,7 @@ void sas_enable_revalidation(struct sas_ha_struct *ha)
sas_phy = container_of(port->phy_list.next, struct asd_sas_phy, sas_phy = container_of(port->phy_list.next, struct asd_sas_phy,
port_phy_el); port_phy_el);
sas_notify_port_event_gfp(sas_phy, sas_notify_port_event(sas_phy,
PORTE_BROADCAST_RCVD, GFP_KERNEL); PORTE_BROADCAST_RCVD, GFP_KERNEL);
} }
mutex_unlock(&ha->disco_mutex); mutex_unlock(&ha->disco_mutex);
@ -141,7 +141,7 @@ int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event,
BUG_ON(event >= PORT_NUM_EVENTS); BUG_ON(event >= PORT_NUM_EVENTS);
ev = sas_alloc_event_gfp(phy, gfp_flags); ev = sas_alloc_event(phy, gfp_flags);
if (!ev) if (!ev)
return -ENOMEM; return -ENOMEM;
@ -171,7 +171,7 @@ int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,
BUG_ON(event >= PHY_NUM_EVENTS); BUG_ON(event >= PHY_NUM_EVENTS);
ev = sas_alloc_event_gfp(phy, gfp_flags); ev = sas_alloc_event(phy, gfp_flags);
if (!ev) if (!ev)
return -ENOMEM; return -ENOMEM;

8
drivers/scsi/libsas/sas_init.c
View File

@ -404,8 +404,8 @@ void sas_resume_ha(struct sas_ha_struct *ha)
if (phy->suspended) { if (phy->suspended) {
dev_warn(&phy->phy->dev, "resume timeout\n"); dev_warn(&phy->phy->dev, "resume timeout\n");
sas_notify_phy_event_gfp(phy, PHYE_RESUME_TIMEOUT, sas_notify_phy_event(phy, PHYE_RESUME_TIMEOUT,
GFP_KERNEL); GFP_KERNEL);
} }
} }
@ -604,8 +604,8 @@ struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy,
if (cmpxchg(&phy->in_shutdown, 0, 1) == 0) { if (cmpxchg(&phy->in_shutdown, 0, 1) == 0) {
pr_notice("The phy%d bursting events, shut it down.\n", pr_notice("The phy%d bursting events, shut it down.\n",
phy->id); phy->id);
sas_notify_phy_event_gfp(phy, PHYE_SHUTDOWN, sas_notify_phy_event(phy, PHYE_SHUTDOWN,
gfp_flags); gfp_flags);
} }
} else { } else {
/* Do not support PHY control, stop allocating events */ /* Do not support PHY control, stop allocating events */