aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2020-08-25 13:02:22 -0400
committerMatthew Heon <mheon@redhat.com>2020-08-25 13:03:01 -0400
commitc1a6e67183e13ad870d12b0a052ef2dcb00bfa1d (patch)
treeaac54c9419132b941b77ec5db434065a1a774b0c /vendor/github.com
parent024f47068a894907ee47b1b90c86090a00586940 (diff)
downloadpodman-c1a6e67183e13ad870d12b0a052ef2dcb00bfa1d.tar.gz
podman-c1a6e67183e13ad870d12b0a052ef2dcb00bfa1d.tar.bz2
podman-c1a6e67183e13ad870d12b0a052ef2dcb00bfa1d.zip
Revert "HACK: Manually include c/storage #698"
This reverts commit ae2ee65eff71c5780e4484f1316dbbdd87bf1760. This was a horrible hack that we did for time reasons, to get 2.0.5 out on schedule; now that it has been merged into c/storage properly we no longer need or want it. Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/containers/storage/drivers/counter.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/vendor/github.com/containers/storage/drivers/counter.go b/vendor/github.com/containers/storage/drivers/counter.go
index 3fc45495b..72551a38d 100644
--- a/vendor/github.com/containers/storage/drivers/counter.go
+++ b/vendor/github.com/containers/storage/drivers/counter.go
@@ -51,10 +51,6 @@ func (c *RefCounter) incdec(path string, infoOp func(minfo *minfo)) int {
if c.checker.IsMounted(path) {
m.count++
}
- } else if !c.checker.IsMounted(path) {
- // if the unmount was performed outside of this process (e.g. conmon cleanup)
- //the ref counter would lose track of it. Check if it is still mounted.
- m.count = 0
}
infoOp(m)
count := m.count