diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-02-04 22:55:01 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-17 09:22:03 -0800 |
| commit | 09cedbef4428580a09b342a7a92a262cfb5cbf25 (patch) | |
| tree | 5ad0b8879ae0a3ef1cff5e5e82da4932ef1216e7 | |
| parent | ad71c96213a68dfe6d761e3ff7ac7ac267fd612a (diff) | |
| download | linux-3.10-09cedbef4428580a09b342a7a92a262cfb5cbf25.tar.gz linux-3.10-09cedbef4428580a09b342a7a92a262cfb5cbf25.tar.bz2 linux-3.10-09cedbef4428580a09b342a7a92a262cfb5cbf25.zip | |
PCI: Fix /sys warning when sriov enabled and card is hot removed
sysfs is a bit stricter now and emits warnings in more cases.
For SRIOV hotplug, we are calling pci_stop_dev() for each VF first
(after we update pci_stop_bus_devices) which remove each VF subdir. So
double check the VF dir in /sys before trying to remove the physfn link.
Signed-of-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | drivers/pci/iov.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 0dab5ecf61b..687b3c8e8e3 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -173,7 +173,13 @@ static void virtfn_remove(struct pci_dev *dev, int id, int reset) sprintf(buf, "virtfn%u", id); sysfs_remove_link(&dev->dev.kobj, buf); - sysfs_remove_link(&virtfn->dev.kobj, "physfn"); + /* + * pci_stop_dev() could have been called for this virtfn already, + * so the directory for the virtfn may have been removed before. + * Double check to avoid spurious sysfs warnings. + */ + if (virtfn->dev.kobj.sd) + sysfs_remove_link(&virtfn->dev.kobj, "physfn"); mutex_lock(&iov->dev->sriov->lock); pci_remove_bus_device(virtfn); |