| Message ID | 20180306182128.23281-3-decui@microsoft.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
> -----Original Message----- > From: Dexuan Cui > Sent: Tuesday, March 6, 2018 10:22 AM > To: bhelgaas@google.com; linux-pci@vger.kernel.org; KY Srinivasan <kys@microsoft.com>; > Stephen Hemminger <sthemmin@microsoft.com>; olaf@aepfle.de; apw@canonical.com; > jasowang@redhat.com > Cc: linux-kernel@vger.kernel.org; driverdev-devel@linuxdriverproject.org; Haiyang Zhang > <haiyangz@microsoft.com>; vkuznets@redhat.com; marcelo.cerri@canonical.com; Michael > Kelley (EOSG) <Michael.H.Kelley@microsoft.com>; Dexuan Cui <decui@microsoft.com>; Jack > Morgenstein <jackm@mellanox.com>; stable@vger.kernel.org > Subject: [PATCH v3 2/6] PCI: hv: hv_eject_device_work(): remove the bogus test > > When we're in the function, hpdev->state must be hv_pcichild_ejecting: > see hv_pci_eject_device(). > > Signed-off-by: Dexuan Cui <decui@microsoft.com> > Cc: Vitaly Kuznetsov <vkuznets@redhat.com> > Cc: Jack Morgenstein <jackm@mellanox.com> > Cc: stable@vger.kernel.org > Cc: Stephen Hemminger <sthemmin@microsoft.com> > Cc: K. Y. Srinivasan <kys@microsoft.com> > Cc: Michael Kelley (EOSG) <Michael.H.Kelley@microsoft.com> > --- > drivers/pci/host/pci-hyperv.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c > index 1233300f41c6..04edb24c92ee 100644 > --- a/drivers/pci/host/pci-hyperv.c > +++ b/drivers/pci/host/pci-hyperv.c > @@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct *work) > > hpdev = container_of(work, struct hv_pci_dev, wrk); > > - if (hpdev->state != hv_pcichild_ejecting) { > - put_pcichild(hpdev, hv_pcidev_ref_pnp); > - return; > - } > + WARN_ON(hpdev->state != hv_pcichild_ejecting); > > /* > * Ejection can come before or after the PCI bus has been set up, so > -- > 2.7.4 Reviewed-by: Michael Kelley <mikelley@microsoft.com>
> -----Original Message----- > From: Dexuan Cui > Sent: Tuesday, March 6, 2018 1:22 PM > To: bhelgaas@google.com; linux-pci@vger.kernel.org; KY Srinivasan > <kys@microsoft.com>; Stephen Hemminger <sthemmin@microsoft.com>; > olaf@aepfle.de; apw@canonical.com; jasowang@redhat.com > Cc: linux-kernel@vger.kernel.org; driverdev-devel@linuxdriverproject.org; > Haiyang Zhang <haiyangz@microsoft.com>; vkuznets@redhat.com; > marcelo.cerri@canonical.com; Michael Kelley (EOSG) > <Michael.H.Kelley@microsoft.com>; Dexuan Cui <decui@microsoft.com>; Jack > Morgenstein <jackm@mellanox.com>; stable@vger.kernel.org > Subject: [PATCH v3 2/6] PCI: hv: hv_eject_device_work(): remove the bogus test > > When we're in the function, hpdev->state must be hv_pcichild_ejecting: > see hv_pci_eject_device(). > > Signed-off-by: Dexuan Cui <decui@microsoft.com> > Cc: Vitaly Kuznetsov <vkuznets@redhat.com> > Cc: Jack Morgenstein <jackm@mellanox.com> > Cc: stable@vger.kernel.org > Cc: Stephen Hemminger <sthemmin@microsoft.com> > Cc: K. Y. Srinivasan <kys@microsoft.com> > Cc: Michael Kelley (EOSG) <Michael.H.Kelley@microsoft.com> > --- Acked-by: Haiyang Zhang <haiyangz@microsoft.com>
diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index 1233300f41c6..04edb24c92ee 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c @@ -1796,10 +1796,7 @@ static void hv_eject_device_work(struct work_struct *work) hpdev = container_of(work, struct hv_pci_dev, wrk); - if (hpdev->state != hv_pcichild_ejecting) { - put_pcichild(hpdev, hv_pcidev_ref_pnp); - return; - } + WARN_ON(hpdev->state != hv_pcichild_ejecting); /* * Ejection can come before or after the PCI bus has been set up, so
When we're in the function, hpdev->state must be hv_pcichild_ejecting: see hv_pci_eject_device(). Signed-off-by: Dexuan Cui <decui@microsoft.com> Cc: Vitaly Kuznetsov <vkuznets@redhat.com> Cc: Jack Morgenstein <jackm@mellanox.com> Cc: stable@vger.kernel.org Cc: Stephen Hemminger <sthemmin@microsoft.com> Cc: K. Y. Srinivasan <kys@microsoft.com> Cc: Michael Kelley (EOSG) <Michael.H.Kelley@microsoft.com> --- drivers/pci/host/pci-hyperv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)