Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: mvsas: Switch back to original libsas event notifiers

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 libas API, while still passing GFP context.
The libsas _gfp() variants will be removed afterwards.

Link: https://lore.kernel.org/r/20210118100955.1761652-19-a.darwish@linutronix.de
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>

authored by

Ahmed S. Darwish and committed by
Martin K. Petersen
36cdfd0f c1220866

+4 -4
+4 -4
drivers/scsi/mvsas/mv_sas.c
··· 229 229 return; 230 230 } 231 231 232 - sas_notify_phy_event_gfp(sas_phy, PHYE_OOB_DONE, gfp_flags); 232 + sas_notify_phy_event(sas_phy, PHYE_OOB_DONE, gfp_flags); 233 233 234 234 if (sas_phy->phy) { 235 235 struct sas_phy *sphy = sas_phy->phy; ··· 261 261 262 262 sas_phy->frame_rcvd_size = phy->frame_rcvd_size; 263 263 264 - sas_notify_port_event_gfp(sas_phy, PORTE_BYTES_DMAED, gfp_flags); 264 + sas_notify_port_event(sas_phy, PORTE_BYTES_DMAED, gfp_flags); 265 265 } 266 266 267 267 void mvs_scan_start(struct Scsi_Host *shost) ··· 1892 1892 if (!(tmp & PHY_READY_MASK)) { 1893 1893 sas_phy_disconnected(sas_phy); 1894 1894 mvs_phy_disconnected(phy); 1895 - sas_notify_phy_event_gfp(sas_phy, 1895 + sas_notify_phy_event(sas_phy, 1896 1896 PHYE_LOSS_OF_SIGNAL, GFP_ATOMIC); 1897 1897 mv_dprintk("phy%d Removed Device\n", phy_no); 1898 1898 } else { ··· 1905 1905 } 1906 1906 } else if (mwq->handler & EXP_BRCT_CHG) { 1907 1907 phy->phy_event &= ~EXP_BRCT_CHG; 1908 - sas_notify_port_event_gfp(sas_phy, 1908 + sas_notify_port_event(sas_phy, 1909 1909 PORTE_BROADCAST_RCVD, GFP_ATOMIC); 1910 1910 mv_dprintk("phy%d Got Broadcast Change\n", phy_no); 1911 1911 }